Commit 5ba61d8a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-fixes-20260323' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patch.msgid.link/20260323160135.39609-1-chunkuang.hu@kernel.org
parents 83318d0c 4cfdfeb6

drivers/gpu/drm/mediatek/mtk_dsi.c

+5 −4
Original line number Diff line number Diff line
@@ -1236,6 +1236,11 @@ static int mtk_dsi_probe(struct platform_device *pdev) 


	dsi->host.ops = &mtk_dsi_ops;

	dsi->host.dev = dev;



	init_waitqueue_head(&dsi->irq_wait_queue);



	platform_set_drvdata(pdev, dsi);



	ret = mipi_dsi_host_register(&dsi->host);

	if (ret < 0)

		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) 
		return dev_err_probe(&pdev->dev, ret, "Failed to request DSI irq\n");

	}



	init_waitqueue_head(&dsi->irq_wait_queue);



	platform_set_drvdata(pdev, dsi);



	dsi->bridge.of_node = dev->of_node;

	dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;