Skip to content
/ linux Public

Commit 0922d28

Browse files
mark1188-uigregkh
authored andcommitted
drm/hisilicon/hibmc: fix no showing problem with loading hibmc manually
[ Upstream commit 0607052 ] When using command rmmod and insmod, there is no showing in second time insmoding. Because DP controller won't send HPD signals, if connection doesn't change or controller isn't reset. So add reset before unreset in hibmc_dp_hw_init(). And also need to move the HDCP cfg after DP controller de-resets, so that HDCP configuration takes effect. Fixes: 3c7623f ("drm/hisilicon/hibmc: Enable this hot plug detect of irq feature") Signed-off-by: Baihan Li <libaihan@huawei.com> Signed-off-by: Yongbang Shi <shiyongbang@huawei.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Reviewed-by: Tao Tian <tiantao6@hisilicon.com> Link: https://patch.msgid.link/20251210023759.3944834-4-shiyongbang@huawei.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 84359ed commit 0922d28

File tree

1 file changed

+5
-2
lines changed
  • drivers/gpu/drm/hisilicon/hibmc/dp

1 file changed

+5
-2
lines changed

drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,16 @@ int hibmc_dp_hw_init(struct hibmc_dp *dp)
177177
dp_dev->link.cap.lanes = 0x2;
178178
dp_dev->link.cap.link_rate = DP_LINK_BW_8_1;
179179

180-
/* hdcp data */
181-
writel(HIBMC_DP_HDCP, dp_dev->base + HIBMC_DP_HDCP_CFG);
182180
/* int init */
183181
writel(0, dp_dev->base + HIBMC_DP_INTR_ENABLE);
184182
writel(HIBMC_DP_INT_RST, dp_dev->base + HIBMC_DP_INTR_ORIGINAL_STATUS);
185183
/* rst */
184+
writel(0, dp_dev->base + HIBMC_DP_DPTX_RST_CTRL);
185+
usleep_range(30, 50);
186+
/* de-rst */
186187
writel(HIBMC_DP_DPTX_RST, dp_dev->base + HIBMC_DP_DPTX_RST_CTRL);
188+
/* hdcp data */
189+
writel(HIBMC_DP_HDCP, dp_dev->base + HIBMC_DP_HDCP_CFG);
187190
/* clock enable */
188191
writel(HIBMC_DP_CLK_EN, dp_dev->base + HIBMC_DP_DPTX_CLK_CTRL);
189192

0 commit comments

Comments
 (0)