| Message ID | 20190527045054.113259-4-hsinyi@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix mediatek drm, dis, and disp-* unbind/bind | expand |
Hi, Hsin-Yi: On Mon, 2019-05-27 at 12:50 +0800, Hsin-Yi Wang wrote: > 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: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.") > Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 57ce4708ef1b..bbfe3a464aea 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -311,6 +311,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) > static void mtk_drm_kms_deinit(struct drm_device *drm) > { > drm_kms_helper_poll_fini(drm); > + drm_atomic_helper_shutdown(drm); This looks not related to this patch. This patch is related to the unbind timing. You could separate this to an independent patch. > > component_unbind_all(drm->dev, drm); > drm_mode_config_cleanup(drm); > @@ -397,7 +398,9 @@ 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->num_pipes = 0; This looks not related to this patch. This patch is related to the unbind timing. You could separate this to an independent patch. Regards, CK > private->drm = NULL; > } > > @@ -568,13 +571,8 @@ static int mtk_drm_probe(struct platform_device *pdev) > 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);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 57ce4708ef1b..bbfe3a464aea 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -311,6 +311,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) static void mtk_drm_kms_deinit(struct drm_device *drm) { drm_kms_helper_poll_fini(drm); + drm_atomic_helper_shutdown(drm); component_unbind_all(drm->dev, drm); drm_mode_config_cleanup(drm); @@ -397,7 +398,9 @@ 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->num_pipes = 0; private->drm = NULL; } @@ -568,13 +571,8 @@ static int mtk_drm_probe(struct platform_device *pdev) 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);
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: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.") Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)