From f45312bab0f0b9efcd6700bdb7a0f1d7316d6899 Mon Sep 17 00:00:00 2001 From: Arun Kannan Date: Thu, 29 Mar 2012 19:43:25 -0700 Subject: [PATCH] gfx: fix local screen blank out with rapid hotplug/unplugs Local display blanks out with too many rapid hot-plug/unplugs. This is due to the call to drm_disable_unused_functions from the bottom-half irq handler. This ends up as a race condition for this function which is called once from drm and once from the bottom-half causing local display to get into bad state. Issue: HSD 207129 Signed-off-by: Amit Bhanagay Signed-off-by: Artem Bityutskiy --- drivers/staging/mrst/drv/otm_hdmi/os/android/android_hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/mrst/drv/otm_hdmi/os/android/android_hdmi.c b/drivers/staging/mrst/drv/otm_hdmi/os/android/android_hdmi.c index 516a3a9..ccc61db 100644 --- a/drivers/staging/mrst/drv/otm_hdmi/os/android/android_hdmi.c +++ b/drivers/staging/mrst/drv/otm_hdmi/os/android/android_hdmi.c @@ -1594,7 +1594,9 @@ enum drm_connector_status android_hdmi_detect(struct drm_connector *connector) * drm_crtc_helper_set_config() do mode setting each time, * especially when plug out and plug in HDMI. */ +#ifdef MFLD_HDMI_PR3 drm_helper_disable_unused_functions(dev); +#endif #ifdef OTM_HDMI_HDCP_ENABLE /* TODO: HPD status should be used by HDCP through attributes */ -- 2.7.4