Commit f0fd8483 authored May 29, 2019 by Hsin-Yi Wang Committed by CK Hu Jun 04, 2019

drm/mediatek: unbind components in mtk_drm_unbind()



Unbinding components (i.e. mtk_dsi and mtk_disp_ovl/rdma/color) will
trigger master(mtk_drm)'s .unbind(), and currently mtk_drm's unbind
won't actually unbind components. During the next bind,
mtk_drm_kms_init() is called, and the components are added back.

.unbind() should call mtk_drm_kms_deinit() to unbind components.

And since component_master_del() in .remove() will trigger .unbind(),
which will also unregister device, it's fine to remove original functions
called here.

Fixes: 119f5173 ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.")
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Signed-off-by: CK Hu <ck.hu@mediatek.com>

parent 8fd7a37b

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -397,6 +397,7 @@ static void mtk_drm_unbind(struct device *dev)
		struct mtk_drm_private *private = dev_get_drvdata(dev);

		drm_dev_unregister(private->drm);
		mtk_drm_kms_deinit(private->drm);
		drm_dev_put(private->drm);
		private->drm = NULL;
		}
		@@ -568,13 +569,8 @@ err_node:
		static int mtk_drm_remove(struct platform_device *pdev)
		{
		struct mtk_drm_private *private = platform_get_drvdata(pdev);
		struct drm_device *drm = private->drm;
		int i;

		drm_dev_unregister(drm);
		mtk_drm_kms_deinit(drm);
		drm_dev_put(drm);

		component_master_del(&pdev->dev, &mtk_drm_ops);
		pm_runtime_disable(&pdev->dev);
		of_node_put(private->mutex_node);

Admin message