From f78485844061c25a9102c9a75ee02e452d4fe954 Mon Sep 17 00:00:00 2001 From: forain Date: Mon, 29 Jul 2024 14:41:45 +0800 Subject: [PATCH] drm: Fix HDMI hot-plug problem Fix HDMI hot-plug problem which occur at the time of switching from 4K@60 t0 1080p@60 monitor. Signed-off-by: forain --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 3177db8275532..ae258bfe6b387 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2158,6 +2158,11 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi, HDMI_MC_SWRSTZ); drm_scdc_set_scrambling(hdmi->curr_conn, 0); } + } else { + hdmi_writeb(hdmi, 0, HDMI_FC_SCRAMBLER_CTRL); + hdmi_writeb(hdmi, (u8)~HDMI_MC_SWRSTZ_TMDSSWRST_REQ, + HDMI_MC_SWRSTZ); + drm_scdc_set_scrambling(hdmi->curr_conn, 0); } /* Set up horizontal active pixel width */