lkml.org 
[lkml]   [2019]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 14/90] drm/mediatek: unbind components in mtk_drm_unbind()
    Date
    [ Upstream commit f0fd848342802bc0f74620d387eead53e8905804 ]

    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>
    Signed-off-by: CK Hu <ck.hu@mediatek.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
    index 47ec604289b7..bbe57ad9acf1 100644
    --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
    +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
    @@ -390,6 +390,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;
    }
    @@ -559,13 +560,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);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-08 17:27    [W:2.585 / U:1.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site