diff options
author | Chen Liangjun <b36089@freescale.com> | 2012-08-21 17:28:50 +0800 |
---|---|---|
committer | Chen Liangjun <b36089@freescale.com> | 2012-08-29 14:22:55 +0800 |
commit | bc1c5b27d0a674c7a212853cba7e391601c72150 (patch) | |
tree | 54bce6101f61e22d10465816f2315c2aeef31384 | |
parent | 26fdaae5e7112550f5ca75c5e4ee19b66f89ae82 (diff) |
ENGR00182456-3 HDMI VIDEO: abort audio when unblank and plugout
In this patch:
1. Close audio PCM stream when video unblank and plugout event happens.
2. Set HDMI cable and blank state into HDMI core driver when
plug/unplug, blank/unblank events happens.
Signed-off-by: Chen Liangjun <b36089@freescale.com>
-rw-r--r-- | drivers/video/mxc_hdmi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c index 0144f7f2cc69..1832a5998d2d 100644 --- a/drivers/video/mxc_hdmi.c +++ b/drivers/video/mxc_hdmi.c @@ -1769,10 +1769,13 @@ static void hotplug_worker(struct work_struct *work) #ifdef CONFIG_MXC_HDMI_CEC mxc_hdmi_cec_handle(0x80); #endif + hdmi_set_cable_state(1); } else if (!(phy_int_pol & HDMI_PHY_HPD)) { /* Plugout event */ dev_dbg(&hdmi->pdev->dev, "EVENT=plugout\n"); + hdmi_set_cable_state(0); + mxc_hdmi_abort_stream(); mxc_hdmi_cable_disconnected(hdmi); /* Make HPD intr active high to capture plugin event */ @@ -2061,10 +2064,13 @@ static int mxc_hdmi_fb_event(struct notifier_block *nb, if (hdmi->fb_reg && hdmi->cable_plugin) mxc_hdmi_setup(hdmi, val); + hdmi_set_blank_state(1); } else if (*((int *)event->data) != hdmi->blank) { dev_dbg(&hdmi->pdev->dev, "event=FB_EVENT_BLANK - BLANK\n"); + hdmi_set_blank_state(0); + mxc_hdmi_abort_stream(); mxc_hdmi_phy_disable(hdmi); |