From 92bdbf29ecde47be0872336ee2b75fb59e19278f Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Mon, 29 Nov 2021 20:01:58 +0800 Subject: [PATCH] drm/rockchip: dw_hdmi: Fix crash when rk3588 hdmitx1 hotplug Signed-off-by: Algea Cao Change-Id: Ia75e8cd7ce6f5862f0ae321d9d9265363f2cb533 --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index ab18502c0128..83dc38ddf1cc 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -1314,7 +1314,7 @@ static irqreturn_t rockchip_hdmi_hardirq(int irq, void *dev_id) val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK); else - val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, + val = HIWORD_UPDATE(RK3588_HDMI1_HPD_INT_MSK, RK3588_HDMI1_HPD_INT_MSK); regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val); return IRQ_WAKE_THREAD; @@ -3046,7 +3046,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, } val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK) | - HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI1_HPD_INT_MSK); + 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) {