drm/mediatek: add connection from RDMA2 to DPI0

This patch add the connection from RDMA2 to DPI0

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 d0d5f337ce1498d05549d6c08f4c07d998d2e239..c88742a6c2b9670403b769ea1edb0be89c131911 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -31,6 +31,7 @@
 #define DISP_REG_CONFIG_DSIE_SEL_IN            0x0a4
 #define DISP_REG_CONFIG_DSIO_SEL_IN            0x0a8
 #define DISP_REG_CONFIG_DPI_SEL_IN             0x0ac
+#define DISP_REG_CONFIG_DISP_RDMA2_SOUT                0x0b8
 #define DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN     0x0c4
 #define DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN     0x0c8
 #define DISP_REG_CONFIG_MMSYS_CG_CON0          0x100
@@ -91,7 +92,9 @@
 #define RDMA1_SOUT_DSI1                        0x1
 #define RDMA1_SOUT_DSI2                        0x4
 #define RDMA1_SOUT_DSI3                        0x5
+#define RDMA2_SOUT_DPI0                        0x2
 #define DPI0_SEL_IN_RDMA1              0x1
+#define DPI0_SEL_IN_RDMA2              0x3
 #define DPI1_SEL_IN_RDMA1              (0x1 << 8)
 #define DSI1_SEL_IN_RDMA1              0x1
 #define DSI2_SEL_IN_RDMA1              (0x1 << 16)
@@ -193,6 +196,9 @@ static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
        } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI1) {
                *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
                value = RDMA1_SOUT_DPI1;
+       } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI0) {
+               *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
+               value = RDMA2_SOUT_DPI0;
        } else {
                value = 0;
        }
@@ -224,6 +230,9 @@ static unsigned int mtk_ddp_sel_in(enum mtk_ddp_comp_id cur,
        } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI3) {
                *addr = DISP_REG_CONFIG_DSIO_SEL_IN;
                value = DSI3_SEL_IN_RDMA1;
+       } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI0) {
+               *addr = DISP_REG_CONFIG_DPI_SEL_IN;
+               value = DPI0_SEL_IN_RDMA2;
        } else if (cur == DDP_COMPONENT_OVL1 && next == DDP_COMPONENT_COLOR1) {
                *addr = DISP_REG_CONFIG_DISP_COLOR1_SEL_IN;
                value = COLOR1_SEL_IN_OVL1;