drm/mediatek: add connection from RDMA2 to DPI1

This patch add the connection from RDMA2 to DPI1

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 c88742a..a4b4183 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -93,9 +93,11 @@
 #define RDMA1_SOUT_DSI2                        0x4
 #define RDMA1_SOUT_DSI3                        0x5
 #define RDMA2_SOUT_DPI0                        0x2
+#define RDMA2_SOUT_DPI1                        0x3
 #define DPI0_SEL_IN_RDMA1              0x1
 #define DPI0_SEL_IN_RDMA2              0x3
 #define DPI1_SEL_IN_RDMA1              (0x1 << 8)
+#define DPI1_SEL_IN_RDMA2              (0x3 << 8)
 #define DSI1_SEL_IN_RDMA1              0x1
 #define DSI2_SEL_IN_RDMA1              (0x1 << 16)
 #define DSI3_SEL_IN_RDMA1              (0x1 << 16)
@@ -199,6 +201,9 @@ static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
        } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI0) {
                *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
                value = RDMA2_SOUT_DPI0;
+       } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI1) {
+               *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT;
+               value = RDMA2_SOUT_DPI1;
        } else {
                value = 0;
        }
@@ -233,6 +238,9 @@ static unsigned int mtk_ddp_sel_in(enum mtk_ddp_comp_id cur,
        } 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_RDMA2 && next == DDP_COMPONENT_DPI1) {
+               *addr = DISP_REG_CONFIG_DPI_SEL_IN;
+               value = DPI1_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;