[PATCH] drm/bridge: dw-hdmi: fix hdmi display lost

Mark Yao mark.yao at rock-chips.com
Thu Aug 11 00:54:03 PDT 2016

hdmi->disabled maybe not match to the real hardware status.

  hdmi->disabled = false;
   if (hdmi->rxsense)
       force = DRM_FORCE_ON;
       force = DRM_FORCE_OFF;

hdmi->rxsense maybe false on bridge enable path, then hdmi->disabled
is false, but actually hardware is power off, they are not match.

So on dw_hdmi_irq, judge the hardware status with hdmi->disabled is wrong.
This bug would cause display lost, unplug/plug can't recovery display.

Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Fabio Estevam <fabio.estevam at freescale.com>
Cc: Liu Ying <gnuiyl at gmail.com>

Signed-off-by: Mark Yao <mark.yao at rock-chips.com>
 drivers/gpu/drm/bridge/dw-hdmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c
index 77ab473..a4fcb47 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
@@ -1563,7 +1563,7 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
 	if (intr_stat &
-		if (!hdmi->disabled && !hdmi->force) {
+		if (!hdmi->bridge_is_on && !hdmi->force) {
 			 * If the RX sense status indicates we're disconnected,
 			 * clear the software rxsense status.

More information about the Linux-rockchip mailing list