drm/mediatek: add connection from RDMA1 to DSI1

This patch add the connection from RDMA1 to DSI1

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 13e91903f49314f0961ad9ca82990e16f97aade2..90228cad051aa22916fd36cf3b459a85b3cc378c 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -28,6 +28,7 @@
 #define DISP_REG_CONFIG_DISP_UFOE_MOUT_EN      0x050
 #define DISP_REG_CONFIG_DISP_COLOR0_SEL_IN     0x084
 #define DISP_REG_CONFIG_DISP_COLOR1_SEL_IN     0x088
+#define DISP_REG_CONFIG_DSIO_SEL_IN            0x0a8
 #define DISP_REG_CONFIG_DPI_SEL_IN             0x0ac
 #define DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN     0x0c4
 #define DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN     0x0c8
@@ -86,8 +87,10 @@
 #define RDMA0_SOUT_DSI3                        0x5
 #define RDMA1_SOUT_DPI0                        0x2
 #define RDMA1_SOUT_DPI1                        0x3
+#define RDMA1_SOUT_DSI1                        0x1
 #define DPI0_SEL_IN_RDMA1              0x1
 #define DPI1_SEL_IN_RDMA1              (0x1 << 8)
+#define DSI1_SEL_IN_RDMA1              0x1
 #define COLOR1_SEL_IN_OVL1             0x1
 
 #define OVL_MOUT_EN_RDMA               0x1
@@ -170,6 +173,9 @@ static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
        } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI3) {
                *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
                value = RDMA0_SOUT_DSI3;
+       } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI1) {
+               *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
+               value = RDMA1_SOUT_DSI1;
        } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI0) {
                *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN;
                value = RDMA1_SOUT_DPI0;
@@ -198,6 +204,9 @@ static unsigned int mtk_ddp_sel_in(enum mtk_ddp_comp_id cur,
        } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI1) {
                *addr = DISP_REG_CONFIG_DPI_SEL_IN;
                value = DPI1_SEL_IN_RDMA1;
+       } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI1) {
+               *addr = DISP_REG_CONFIG_DSIO_SEL_IN;
+               value = DSI1_SEL_IN_RDMA1;
        } else if (cur == DDP_COMPONENT_OVL1 && next == DDP_COMPONENT_COLOR1) {
                *addr = DISP_REG_CONFIG_DISP_COLOR1_SEL_IN;
                value = COLOR1_SEL_IN_OVL1;