drm/mediatek: Add support for mediatek SOC MT2712

This patch add support for the Mediatek MT2712 DISP subsystem.
There are two OVL engine and three disp output in MT2712.

Signed-off-by: Stu Hsieh <stu.hsieh@mediatek.com>
Signed-off-by: CK Hu <ck.hu@mediatek.com>

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
index 15e436d..87e4191 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -65,6 +65,24 @@
 #define MT8173_MUTEX_MOD_DISP_PWM1             24
 #define MT8173_MUTEX_MOD_DISP_OD               25
 
+#define MT2712_MUTEX_MOD_DISP_PWM2             10
+#define MT2712_MUTEX_MOD_DISP_OVL0             11
+#define MT2712_MUTEX_MOD_DISP_OVL1             12
+#define MT2712_MUTEX_MOD_DISP_RDMA0            13
+#define MT2712_MUTEX_MOD_DISP_RDMA1            14
+#define MT2712_MUTEX_MOD_DISP_RDMA2            15
+#define MT2712_MUTEX_MOD_DISP_WDMA0            16
+#define MT2712_MUTEX_MOD_DISP_WDMA1            17
+#define MT2712_MUTEX_MOD_DISP_COLOR0           18
+#define MT2712_MUTEX_MOD_DISP_COLOR1           19
+#define MT2712_MUTEX_MOD_DISP_AAL0             20
+#define MT2712_MUTEX_MOD_DISP_UFOE             22
+#define MT2712_MUTEX_MOD_DISP_PWM0             23
+#define MT2712_MUTEX_MOD_DISP_PWM1             24
+#define MT2712_MUTEX_MOD_DISP_OD0              25
+#define MT2712_MUTEX_MOD2_DISP_AAL1            33
+#define MT2712_MUTEX_MOD2_DISP_OD1             34
+
 #define MT2701_MUTEX_MOD_DISP_OVL              3
 #define MT2701_MUTEX_MOD_DISP_WDMA             6
 #define MT2701_MUTEX_MOD_DISP_COLOR            7
@@ -138,6 +156,26 @@ static const unsigned int mt2701_mutex_mod[DDP_COMPONENT_ID_MAX] = {
        [DDP_COMPONENT_WDMA0] = MT2701_MUTEX_MOD_DISP_WDMA,
 };
 
+static const unsigned int mt2712_mutex_mod[DDP_COMPONENT_ID_MAX] = {
+       [DDP_COMPONENT_AAL0] = MT2712_MUTEX_MOD_DISP_AAL0,
+       [DDP_COMPONENT_AAL1] = MT2712_MUTEX_MOD2_DISP_AAL1,
+       [DDP_COMPONENT_COLOR0] = MT2712_MUTEX_MOD_DISP_COLOR0,
+       [DDP_COMPONENT_COLOR1] = MT2712_MUTEX_MOD_DISP_COLOR1,
+       [DDP_COMPONENT_OD0] = MT2712_MUTEX_MOD_DISP_OD0,
+       [DDP_COMPONENT_OD1] = MT2712_MUTEX_MOD2_DISP_OD1,
+       [DDP_COMPONENT_OVL0] = MT2712_MUTEX_MOD_DISP_OVL0,
+       [DDP_COMPONENT_OVL1] = MT2712_MUTEX_MOD_DISP_OVL1,
+       [DDP_COMPONENT_PWM0] = MT2712_MUTEX_MOD_DISP_PWM0,
+       [DDP_COMPONENT_PWM1] = MT2712_MUTEX_MOD_DISP_PWM1,
+       [DDP_COMPONENT_PWM2] = MT2712_MUTEX_MOD_DISP_PWM2,
+       [DDP_COMPONENT_RDMA0] = MT2712_MUTEX_MOD_DISP_RDMA0,
+       [DDP_COMPONENT_RDMA1] = MT2712_MUTEX_MOD_DISP_RDMA1,
+       [DDP_COMPONENT_RDMA2] = MT2712_MUTEX_MOD_DISP_RDMA2,
+       [DDP_COMPONENT_UFOE] = MT2712_MUTEX_MOD_DISP_UFOE,
+       [DDP_COMPONENT_WDMA0] = MT2712_MUTEX_MOD_DISP_WDMA0,
+       [DDP_COMPONENT_WDMA1] = MT2712_MUTEX_MOD_DISP_WDMA1,
+};
+
 static const unsigned int mt8173_mutex_mod[DDP_COMPONENT_ID_MAX] = {
        [DDP_COMPONENT_AAL0] = MT8173_MUTEX_MOD_DISP_AAL,
        [DDP_COMPONENT_COLOR0] = MT8173_MUTEX_MOD_DISP_COLOR0,
@@ -533,6 +571,7 @@ static int mtk_ddp_remove(struct platform_device *pdev)
 
 static const struct of_device_id ddp_driver_dt_match[] = {
        { .compatible = "mediatek,mt2701-disp-mutex", .data = mt2701_mutex_mod},
+       { .compatible = "mediatek,mt2712-disp-mutex", .data = mt2712_mutex_mod},
        { .compatible = "mediatek,mt8173-disp-mutex", .data = mt8173_mutex_mod},
        {},
 };

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 1f06572..3972111 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -146,6 +146,32 @@ static const enum mtk_ddp_comp_id mt2701_mtk_ddp_ext[] = {
        DDP_COMPONENT_DPI0,
 };
 
+static const enum mtk_ddp_comp_id mt2712_mtk_ddp_main[] = {
+       DDP_COMPONENT_OVL0,
+       DDP_COMPONENT_COLOR0,
+       DDP_COMPONENT_AAL0,
+       DDP_COMPONENT_OD0,
+       DDP_COMPONENT_RDMA0,
+       DDP_COMPONENT_DPI0,
+       DDP_COMPONENT_PWM0,
+};
+
+static const enum mtk_ddp_comp_id mt2712_mtk_ddp_ext[] = {
+       DDP_COMPONENT_OVL1,
+       DDP_COMPONENT_COLOR1,
+       DDP_COMPONENT_AAL1,
+       DDP_COMPONENT_OD1,
+       DDP_COMPONENT_RDMA1,
+       DDP_COMPONENT_DPI1,
+       DDP_COMPONENT_PWM1,
+};
+
+static const enum mtk_ddp_comp_id mt2712_mtk_ddp_third[] = {
+       DDP_COMPONENT_RDMA2,
+       DDP_COMPONENT_DSI3,
+       DDP_COMPONENT_PWM2,
+};
+
 static const enum mtk_ddp_comp_id mt8173_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_COLOR0,
@@ -173,6 +199,15 @@ static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = {
        .shadow_register = true,
 };
 
+static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
+       .main_path = mt2712_mtk_ddp_main,
+       .main_len = ARRAY_SIZE(mt2712_mtk_ddp_main),
+       .ext_path = mt2712_mtk_ddp_ext,
+       .ext_len = ARRAY_SIZE(mt2712_mtk_ddp_ext),
+       .third_path = mt2712_mtk_ddp_third,
+       .third_len = ARRAY_SIZE(mt2712_mtk_ddp_third),
+};
+
 static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
        .main_path = mt8173_mtk_ddp_main,
        .main_len = ARRAY_SIZE(mt8173_mtk_ddp_main),
@@ -393,6 +428,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = {
          .data = (void *)MTK_DPI },
        { .compatible = "mediatek,mt2701-disp-mutex",
          .data = (void *)MTK_DISP_MUTEX },
+       { .compatible = "mediatek,mt2712-disp-mutex",
+         .data = (void *)MTK_DISP_MUTEX },
        { .compatible = "mediatek,mt8173-disp-mutex",
          .data = (void *)MTK_DISP_MUTEX },
        { .compatible = "mediatek,mt2701-disp-pwm",
@@ -575,6 +612,8 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend,
 static const struct of_device_id mtk_drm_of_ids[] = {
        { .compatible = "mediatek,mt2701-mmsys",
          .data = &mt2701_mmsys_driver_data},
+       { .compatible = "mediatek,mt2712-mmsys",
+         .data = &mt2712_mmsys_driver_data},
        { .compatible = "mediatek,mt8173-mmsys",
          .data = &mt8173_mmsys_driver_data},
        { }