From ebee330352cc6411470caac530909f4d2516e563 Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Thu, 27 Apr 2023 16:30:50 +0800 Subject: [PATCH] drm/rockchip: dw_hdmi-qp: Fix kernel logo color error If other display port such as edp bind failed, hdmi will re-bind. The conditions for determining whether uboot logo is enabled are unreliable. Changing judgment flag to an unused reg. Signed-off-by: Algea Cao Change-Id: I2b634ae159934bb62ea1a08864bf8b1b9cbb479d --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 3 ++- 1 file changed, 2 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 19d09adc0fbe..fe5ed0b3e4a9 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -3280,7 +3280,8 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi_writel(hdmi, 0, MAINUNIT_0_INT_MASK_N); hdmi_writel(hdmi, 0, MAINUNIT_1_INT_MASK_N); hdmi_writel(hdmi, 428571429, TIMER_BASE_CONFIG0); - if ((hdmi_readl(hdmi, CMU_STATUS) & DISPLAY_CLK_MONITOR) == DISPLAY_CLK_LOCKED) { + if (hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data) == connector_status_connected && + (hdmi_readl(hdmi, VIDEO_INTERFACE_CONFIG0) & BIT(21))) { hdmi->initialized = true; hdmi->disabled = false; }