From 6680da5e1fb73778557bf14bf4bfc979633d07ce Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Tue, 30 Nov 2021 09:22:28 +0800 Subject: [PATCH] drm/rockchip: dw_hdmi: Fix hdmitx0 hpd irq mute by hdmitx1 driver Signed-off-by: Algea Cao Change-Id: Ia4b4c977208f925c0f2c2fe6e763f3cd7ecc9db9 --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 83dc38ddf1cc..aad0ace9f115 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -3045,8 +3045,10 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, return ret; } - val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK) | - HIWORD_UPDATE(RK3588_HDMI1_HPD_INT_MSK, RK3588_HDMI1_HPD_INT_MSK); + if (!hdmi->id) + val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK); + else + val = HIWORD_UPDATE(RK3588_HDMI1_HPD_INT_MSK, RK3588_HDMI1_HPD_INT_MSK); regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val); if (hdmi->is_hdmi_qp) {