[PATCH] drm/mediatek: add exception handing in mtk_drm_probe() if component init fail

Chun-Kuang Hu chunkuang.hu at kernel.org
Mon Sep 14 19:38:51 EDT 2020


Hi, Yu Kuai:

Yu Kuai <yukuai3 at huawei.com> 於 2020年9月9日 週三 下午4:50寫道:
>
> mtk_ddp_comp_init() is called in a loop in mtk_drm_probe(), if it
> fail, previous successive init component is not proccessed.
>
> Thus uninitialize valid component and put their device if component
> init failed.

Reviewed-by: Chun-Kuang Hu <chunkuang.hu at kernel.org>

>
> Fixes: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.")
> Signed-off-by: Yu Kuai <yukuai3 at huawei.com>
>
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 040a8f393fe2..75a6cf231fd7 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -544,8 +544,13 @@ static int mtk_drm_probe(struct platform_device *pdev)
>         pm_runtime_disable(dev);
>  err_node:
>         of_node_put(private->mutex_node);
> -       for (i = 0; i < DDP_COMPONENT_ID_MAX; i++)
> +       for (i = 0; i < DDP_COMPONENT_ID_MAX; i++) {
>                 of_node_put(private->comp_node[i]);
> +               if (private->ddp_comp[i]) {
> +                       put_device(private->ddp_comp[i]->larb_dev);
> +                       private->ddp_comp[i] = NULL;
> +               }
> +       }
>         return ret;
>  }
>
> --
> 2.25.4
>



More information about the linux-arm-kernel mailing list