From 4aa5b7a0fa4c5b2ab10a104cc72c85f81d3a94f2 Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Mon, 30 Sep 2024 14:38:14 +0800 Subject: [PATCH] drm/bridge: synopsys: dw-hdmi-qp: Don't read scdc regs with hdmi1.4 sink Only hdmi2.0 and later versions support scdc. Change-Id: Ice2079afe38e624ef7a0dbb2a67f6c8c5d5ba58d Signed-off-by: Algea Cao --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c index 8e9208095563..1e952e1bbbe8 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -3179,7 +3179,9 @@ static int dw_hdmi_connector_atomic_check(struct drm_connector *connector, extcon_set_state_sync(hdmi->extcon, EXTCON_DISP_HDMI, true); } - drm_scdc_readb(hdmi->ddc, SCDC_TMDS_CONFIG, &val); + val = 0; + if (dw_hdmi_support_scdc(hdmi, &connector->display_info)) + drm_scdc_readb(hdmi->ddc, SCDC_TMDS_CONFIG, &val); /* if plug out before hdmi bind, reset hdmi */ if (vmode->mtmdsclock >= 340000000 && vmode->mpixelclock <= 600000000 && !(val & SCDC_TMDS_BIT_CLOCK_RATIO_BY_40) && !hdmi->force_kernel_output)