From: Zheng Yang Date: Fri, 10 Jul 2015 07:12:53 +0000 (+0800) Subject: hdmi: mute output before disabled or suspended. X-Git-Tag: firefly_0821_release~3919 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=411efa27e3c2ed21557507c54eb4394ac1498d90;p=firefly-linux-kernel-4.4.55.git hdmi: mute output before disabled or suspended. Signed-off-by: Zheng Yang --- diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c index b2400175cf02..1261107329dc 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c @@ -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)