Skip to content

Commit 5ba61d8

Browse files
committed
Merge tag 'mediatek-drm-fixes-20260323' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-fixes
Mediatek DRM Fixes - 20260323 1. dsi: Store driver data before invoking mipi_dsi_host_register Signed-off-by: Dave Airlie <[email protected]> From: Chun-Kuang Hu <[email protected]> Link: https://patch.msgid.link/[email protected]
2 parents 83318d0 + 4cfdfeb commit 5ba61d8

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

drivers/gpu/drm/mediatek/mtk_dsi.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,6 +1236,11 @@ static int mtk_dsi_probe(struct platform_device *pdev)
12361236

12371237
dsi->host.ops = &mtk_dsi_ops;
12381238
dsi->host.dev = dev;
1239+
1240+
init_waitqueue_head(&dsi->irq_wait_queue);
1241+
1242+
platform_set_drvdata(pdev, dsi);
1243+
12391244
ret = mipi_dsi_host_register(&dsi->host);
12401245
if (ret < 0)
12411246
return dev_err_probe(dev, ret, "Failed to register DSI host\n");
@@ -1247,10 +1252,6 @@ static int mtk_dsi_probe(struct platform_device *pdev)
12471252
return dev_err_probe(&pdev->dev, ret, "Failed to request DSI irq\n");
12481253
}
12491254

1250-
init_waitqueue_head(&dsi->irq_wait_queue);
1251-
1252-
platform_set_drvdata(pdev, dsi);
1253-
12541255
dsi->bridge.of_node = dev->of_node;
12551256
dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
12561257

0 commit comments

Comments
 (0)