drm/mediatek: add ddp component OD1

This patch add the component OD1 and
rename the OD to OD0

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 7217665f4b5d119cc753cdc91a046e27cf971c83..58e44349e31574c9fcc76dd35c2e0f094f91f9b1 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -114,7 +114,7 @@ static const unsigned int mt8173_mutex_mod[DDP_COMPONENT_ID_MAX] = {
        [DDP_COMPONENT_COLOR0] = MT8173_MUTEX_MOD_DISP_COLOR0,
        [DDP_COMPONENT_COLOR1] = MT8173_MUTEX_MOD_DISP_COLOR1,
        [DDP_COMPONENT_GAMMA] = MT8173_MUTEX_MOD_DISP_GAMMA,
-       [DDP_COMPONENT_OD] = MT8173_MUTEX_MOD_DISP_OD,
+       [DDP_COMPONENT_OD0] = MT8173_MUTEX_MOD_DISP_OD,
        [DDP_COMPONENT_OVL0] = MT8173_MUTEX_MOD_DISP_OVL0,
        [DDP_COMPONENT_OVL1] = MT8173_MUTEX_MOD_DISP_OVL1,
        [DDP_COMPONENT_PWM0] = MT8173_MUTEX_MOD_DISP_PWM0,
@@ -139,7 +139,7 @@ static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
        } else if (cur == DDP_COMPONENT_OVL0 && next == DDP_COMPONENT_RDMA0) {
                *addr = DISP_REG_CONFIG_DISP_OVL_MOUT_EN;
                value = OVL_MOUT_EN_RDMA;
-       } else if (cur == DDP_COMPONENT_OD && next == DDP_COMPONENT_RDMA0) {
+       } else if (cur == DDP_COMPONENT_OD0 && next == DDP_COMPONENT_RDMA0) {
                *addr = DISP_REG_CONFIG_DISP_OD_MOUT_EN;
                value = OD_MOUT_EN_RDMA0;
        } else if (cur == DDP_COMPONENT_UFOE && next == DDP_COMPONENT_DSI0) {

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index 0919039805aa15ebeba5098fb8dcad2201713d35..87acf6be87f6c371ed6b14553714950c29b9eae1 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -227,7 +227,8 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = {
        [DDP_COMPONENT_DSI0]    = { MTK_DSI,            0, NULL },
        [DDP_COMPONENT_DSI1]    = { MTK_DSI,            1, NULL },
        [DDP_COMPONENT_GAMMA]   = { MTK_DISP_GAMMA,     0, &ddp_gamma },
-       [DDP_COMPONENT_OD]      = { MTK_DISP_OD,        0, &ddp_od },
+       [DDP_COMPONENT_OD0]     = { MTK_DISP_OD,        0, &ddp_od },
+       [DDP_COMPONENT_OD1]     = { MTK_DISP_OD,        1, &ddp_od },
        [DDP_COMPONENT_OVL0]    = { MTK_DISP_OVL,       0, NULL },
        [DDP_COMPONENT_OVL1]    = { MTK_DISP_OVL,       1, NULL },
        [DDP_COMPONENT_PWM0]    = { MTK_DISP_PWM,       0, NULL },

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index eee3c0cc2632bbd57254e57f2888a5139e8459fc..9b19fc4423f1f8c39f01c72028a5789b22a2bd69 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -50,7 +50,8 @@ enum mtk_ddp_comp_id {
        DDP_COMPONENT_DSI0,
        DDP_COMPONENT_DSI1,
        DDP_COMPONENT_GAMMA,
-       DDP_COMPONENT_OD,
+       DDP_COMPONENT_OD0,
+       DDP_COMPONENT_OD1,
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_OVL1,
        DDP_COMPONENT_PWM0,

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index a415260f3d5fce6f83cb20a1063be0687b0d4c16..08d5d0b47bfe578a343db06c45a6b05687b6cfac 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -150,7 +150,7 @@ static const enum mtk_ddp_comp_id mt8173_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_COLOR0,
        DDP_COMPONENT_AAL0,
-       DDP_COMPONENT_OD,
+       DDP_COMPONENT_OD0,
        DDP_COMPONENT_RDMA0,
        DDP_COMPONENT_UFOE,
        DDP_COMPONENT_DSI0,