1. Bridge to hdmi-codec to support audio feature. At the same time,
   the function of automatically detecting audio is removed.
2. It is observed that some DP-to-HDMI dongles will get into bad
   states if sending InfoFrame without audio data. Defer to enable
   it6505's audio feature when PCM triggers START or RESUME.

Signed-off-by: Jiaxin Yu <jiaxin...@mediatek.com>
---
 drivers/gpu/drm/bridge/ite-it6505.c | 36 ++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/bridge/ite-it6505.c 
b/drivers/gpu/drm/bridge/ite-it6505.c
index dfe4351c9bdd..f4e1a1d94ed8 100644
--- a/drivers/gpu/drm/bridge/ite-it6505.c
+++ b/drivers/gpu/drm/bridge/ite-it6505.c
@@ -2159,7 +2159,6 @@ static void it6505_stop_link_train(struct it6505 *it6505)
 
 static void it6505_link_train_ok(struct it6505 *it6505)
 {
-       struct device *dev = &it6505->client->dev;
 
        it6505->link_state = LINK_OK;
        /* disalbe mute enable avi info frame */
@@ -2167,11 +2166,6 @@ static void it6505_link_train_ok(struct it6505 *it6505)
        it6505_set_bits(it6505, REG_INFOFRAME_CTRL,
                        EN_VID_CTRL_PKT, EN_VID_CTRL_PKT);
 
-       if (it6505_audio_input(it6505)) {
-               DRM_DEV_DEBUG_DRIVER(dev, "Enable audio!");
-               it6505_enable_audio(it6505);
-       }
-
        if (it6505->hdcp_desired)
                it6505_start_hdcp(it6505);
 }
@@ -2823,6 +2817,36 @@ static void __maybe_unused it6505_audio_shutdown(struct 
device *dev, void *data)
                it6505_disable_audio(it6505);
 }
 
+static int __maybe_unused it6505_audio_setup_trigger(struct it6505 *it6505, 
int cmd)
+{
+       struct device *dev = &it6505->client->dev;
+
+       DRM_DEV_DEBUG_DRIVER(dev, "event: %d", cmd);
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+       case SNDRV_PCM_TRIGGER_RESUME:
+               queue_delayed_work(system_wq, &it6505->delayed_audio,
+                                  msecs_to_jiffies(180));
+               break;
+       case SNDRV_PCM_TRIGGER_STOP:
+       case SNDRV_PCM_TRIGGER_SUSPEND:
+               cancel_delayed_work(&it6505->delayed_audio);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int __maybe_unused it6505_audio_trigger(struct device *dev, int cmd)
+{
+       struct it6505 *it6505 = dev_get_drvdata(dev);
+
+       return it6505_audio_setup_trigger(it6505, cmd);
+}
+
 static int __maybe_unused it6505_audio_hook_plugged_cb(struct device *dev,
                                                       void *data,
                                                       hdmi_codec_plugged_cb fn,
-- 
2.18.0

Reply via email to