From: Phong LE Date: Wed, 19 Feb 2020 14:13:24 +0000 (+0100) Subject: drm/mediatek: Handle component type MTK_DISP_OVL_2L correctly X-Git-Tag: v5.5.9~49 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7ff3e83e64a50de10465c55add768fa41f71b8fb;p=users%2Fdwmw2%2Flinux.git drm/mediatek: Handle component type MTK_DISP_OVL_2L correctly commit 3d2ed431b8f39483477bc3c3a2aefbc9778ffe12 upstream. The larb device remains NULL if the type is MTK_DISP_OVL_2L. A kernel panic is raised when a crtc uses mtk_smi_larb_get or mtk_smi_larb_put. Fixes: b17bdd0d7a73 ("drm/mediatek: add component OVL_2L0") Signed-off-by: Phong LE Signed-off-by: CK Hu Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index 7f21307cda75b..c26b2faa15cf1 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -358,6 +358,7 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, /* Only DMA capable components need the LARB property */ comp->larb_dev = NULL; if (type != MTK_DISP_OVL && + type != MTK_DISP_OVL_2L && type != MTK_DISP_RDMA && type != MTK_DISP_WDMA) return 0;