Add DSI as main display output for mt8188 vdosys0.

Signed-off-by: Nathan Lu <nathan...@mediatek.com>
Signed-off-by: Jason-JH.Lin <jason-jh....@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_drv.h     | 1 +
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 +
 drivers/gpu/drm/mediatek/mtk_drm_drv.c      | 5 +++++
 drivers/gpu/drm/mediatek/mtk_dsi.c          | 9 +++++++++
 4 files changed, 16 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h 
b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index 72c57442f965..bf06ccb65652 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -48,6 +48,7 @@ int mtk_dpi_encoder_index(struct device *dev);
 
 void mtk_dsi_ddp_start(struct device *dev);
 void mtk_dsi_ddp_stop(struct device *dev);
+int mtk_dsi_encoder_index(struct device *dev);
 
 int mtk_gamma_clk_enable(struct device *dev);
 void mtk_gamma_clk_disable(struct device *dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c 
b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index fe20ce26b19f..214233d36487 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -318,6 +318,7 @@ static const struct mtk_ddp_comp_funcs ddp_dsc = {
 static const struct mtk_ddp_comp_funcs ddp_dsi = {
        .start = mtk_dsi_ddp_start,
        .stop = mtk_dsi_ddp_stop,
+       .encoder_index = mtk_dsi_encoder_index,
 };
 
 static const struct mtk_ddp_comp_funcs ddp_gamma = {
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c 
b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index d8c49614a107..7ea4dc87c558 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -191,8 +191,13 @@ static const unsigned int mt8188_mtk_ddp_main_routes_0[] = 
{
        DDP_COMPONENT_DP_INTF0
 };
 
+static const unsigned int mt8188_mtk_ddp_main_routes_1[] = {
+       DDP_COMPONENT_DSI0
+};
+
 static const struct mtk_drm_route mt8188_mtk_ddp_main_routes[] = {
        {0, ARRAY_SIZE(mt8188_mtk_ddp_main_routes_0), 
mt8188_mtk_ddp_main_routes_0},
+       {0, ARRAY_SIZE(mt8188_mtk_ddp_main_routes_1), 
mt8188_mtk_ddp_main_routes_1},
 };
 
 static const unsigned int mt8192_mtk_ddp_main[] = {
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c 
b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 7d5250351193..f9d2d5447e2e 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -865,6 +865,15 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, 
struct mtk_dsi *dsi)
        return ret;
 }
 
+int mtk_dsi_encoder_index(struct device *dev)
+{
+       struct mtk_dsi *dsi = dev_get_drvdata(dev);
+       int encoder_index = drm_encoder_index(&dsi->encoder);
+
+       dev_dbg(dev, "encoder index:%d", encoder_index);
+       return encoder_index;
+}
+
 static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
 {
        int ret;
-- 
2.18.0

Reply via email to