hdmi: mute output before disabled or suspended.
authorZheng Yang <zhengyang@rock-chips.com>
Fri, 10 Jul 2015 07:12:53 +0000 (15:12 +0800)
committerZheng Yang <zhengyang@rock-chips.com>
Fri, 10 Jul 2015 07:12:53 +0000 (15:12 +0800)
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
drivers/video/rockchip/hdmi/rockchip-hdmi-core.c

index b2400175cf02b56ec7ae7d8a1c5b95448a945c4f..1261107329dc26ffb7f681a27ebba401c62251c8 100644 (file)
@@ -317,6 +317,10 @@ static void hdmi_work_queue(struct work_struct *work)
                break;
        case HDMI_DISABLE_CTL:
                if (hdmi->enable) {
+                       if (hdmi->hotplug == HDMI_HPD_ACTIVED)
+                               hdmi_wq_set_output(hdmi,
+                                                  HDMI_VIDEO_MUTE |
+                                                  HDMI_AUDIO_MUTE);
                        if (!hdmi->sleep) {
                                if (hdmi->ops->disable)
                                        hdmi->ops->disable(hdmi);
@@ -327,8 +331,10 @@ static void hdmi_work_queue(struct work_struct *work)
                break;
        case HDMI_SUSPEND_CTL:
                if (!hdmi->sleep) {
-                       hdmi_wq_set_output(hdmi,
-                                          HDMI_VIDEO_MUTE | HDMI_AUDIO_MUTE);
+                       if (hdmi->hotplug == HDMI_HPD_ACTIVED)
+                               hdmi_wq_set_output(hdmi,
+                                                  HDMI_VIDEO_MUTE |
+                                                  HDMI_AUDIO_MUTE);
                        if (hdmi->ops->disable)
                                hdmi->ops->disable(hdmi);
                        if (hdmi->enable)