| From 3d2ed431b8f39483477bc3c3a2aefbc9778ffe12 Mon Sep 17 00:00:00 2001 |
| From: Phong LE <ple@baylibre.com> |
| Date: Wed, 19 Feb 2020 15:13:24 +0100 |
| Subject: drm/mediatek: Handle component type MTK_DISP_OVL_2L correctly |
| |
| From: Phong LE <ple@baylibre.com> |
| |
| 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 <ple@baylibre.com> |
| Signed-off-by: CK Hu <ck.hu@mediatek.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- 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 |
| /* 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; |
