From 97d6f58c1ecc22bf0c0028bb6aa818f700114a6e Mon Sep 17 00:00:00 2001 From: Aravind Venkateswaran Date: Thu, 18 Sep 2014 16:48:53 -0700 Subject: [PATCH] msm: mdss: hdmi: notify audio switch device only for CEA resolutions Upon successful connection, audio should switch over to HDMI only for CEA resolutions. In the current implementation, when HDCP authentication succeeds, the audio switch device is notified irrespective of the selected resolution even though no audio related setup is done. This can lead to unintended consequences during video playback. Fix this by notifying the audio switch device only for CEA resolutions. Change-Id: If1372c0d6171d6d8091a768462043bffc41109d1 Signed-off-by: Aravind Venkateswaran --- drivers/video/fbdev/msm/mdss_hdmi_tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index d026c8fa3923..7db45a4ea158 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -522,7 +522,8 @@ static inline void hdmi_tx_set_audio_switch_node( return; } - if (!hdmi_tx_is_dvi_mode(hdmi_ctrl)) { + if (!hdmi_tx_is_dvi_mode(hdmi_ctrl) && + hdmi_tx_is_cea_format(hdmi_ctrl->video_resolution)) { switch_set_state(&hdmi_ctrl->audio_sdev, val); DEV_INFO("%s: audio state %s %d\n", __func__,