[coreboot-gerrit] [M] Change in coreboot[master]: soc/mediatek/mt8188: Add display data path for MIPI output

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/70181 )

(

3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: soc/mediatek/mt8188: Add display data path for MIPI output
......................................................................

soc/mediatek/mt8188: Add display data path for MIPI output

For geralt project, we also support MIPI panel as our firmware display.
So add this patch to configure ddp to choose eDP display or MIPI panel
display.

BUG=b:244208960
TEST=test firmware display pass for both eDP and MIPI panel on MT8188
EVB.

Change-Id: I06f38b1889811274588c26e9284da4d502acf38b
Signed-off-by: Bo-Chen Chen 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70181
Reviewed-by: Yidi Lin 
Reviewed-by: Yu-Ping Wu 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/geralt/display.c
M src/soc/mediatek/mt8188/ddp.c
M src/soc/mediatek/mt8188/include/soc/ddp.h
3 files changed, 59 insertions(+), 18 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Yu-Ping Wu: Looks good to me, approved
  Yidi Lin: Looks good to me, but someone else must approve
  Rex-BC Chen: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/geralt/display.c b/src/mainboard/google/geralt/display.c
index 3db9171..eaee6c8 100644
--- a/src/mainboard/google/geralt/display.c
+++ b/src/mainboard/google/geralt/display.c
@@ -55,7 +55,7 @@

edid_set_framebuffer_bits_per_pixel(&edid, 32, 0);

-	mtk_ddp_mode_set(&edid);
+	mtk_ddp_mode_set(&edid, DISP_PATH_EDP);
    info = fb_new_framebuffer_info_from_edid(&edid, (uintptr_t)0);
    if (info)
    	fb_set_orientation(info, LB_FB_ORIENTATION_NORMAL);
diff --git a/src/soc/mediatek/mt8188/ddp.c b/src/soc/mediatek/mt8188/ddp.c
index 8d2d43a..ce14fa7 100644
--- a/src/soc/mediatek/mt8188/ddp.c
+++ b/src/soc/mediatek/mt8188/ddp.c
@@ -6,24 +6,36 @@
 #include <soc/addressmap.h>
 #include <soc/ddp.h>

-static void disp_config_main_path_connection(void)
+static void disp_config_main_path_connection(enum disp_path_sel path)
 {
    /* ovl0 */
    write32(&mmsys_cfg->mmsys_ovl_mout_en,
    	DISP_OVL0_TO_DISP_RDMA0);
-	write32(&mmsys_cfg->mmsys_dp_intf0_sel_in,
-		SEL_IN_DP_INTF0_FROM_DISP_DITHER0);
-	write32(&mmsys_cfg->mmsys_dither0_sel_out,
-		SEL_OUT_DISP_DITHER0_TO_DP_INTF0);
+
+	if (path == DISP_PATH_EDP) {
+		write32(&mmsys_cfg->mmsys_dp_intf0_sel_in,
+			SEL_IN_DP_INTF0_FROM_DISP_DITHER0);
+		write32(&mmsys_cfg->mmsys_dither0_sel_out,
+			SEL_OUT_DISP_DITHER0_TO_DP_INTF0);
+	} else {
+		write32(&mmsys_cfg->mmsys_dsi0_sel_in,
+			SEL_IN_DSI0_FROM_DISP_DITHER0);
+		write32(&mmsys_cfg->mmsys_dither0_sel_out,
+			SEL_OUT_DISP_DITHER0_TO_DSI0);
+	}
 }

-static void disp_config_main_path_mutex(void)
+static void disp_config_main_path_mutex(enum disp_path_sel path)
 {
    write32(&disp_mutex->mutex[0].mod, MUTEX_MOD_MAIN_PATH);

-	/* Clock source from DP_INTF0 */
-	write32(&disp_mutex->mutex[0].ctl,
-		MUTEX_SOF_DP_INTF0 | (MUTEX_SOF_DP_INTF0 << 7));
+	if (path == DISP_PATH_EDP)
+		write32(&disp_mutex->mutex[0].ctl,
+			MUTEX_SOF_DP_INTF0 | (MUTEX_SOF_DP_INTF0 << 7));
+	else
+		write32(&disp_mutex->mutex[0].ctl,
+			MUTEX_SOF_DSI0 | (MUTEX_SOF_DSI0 << 7));
+
    write32(&disp_mutex->mutex[0].en, BIT(0));
 }

@@ -94,7 +106,7 @@
    write32(&regs->en, PQ_EN);
 }

-static void main_disp_path_setup(u32 width, u32 height, u32 vrefresh)
+static void main_disp_path_setup(u32 width, u32 height, u32 vrefresh, enum disp_path_sel path)
 {
    u32 idx;
    const u32 pixel_clk = width * height * vrefresh;
@@ -114,8 +126,8 @@
    gamma_config(width, height);
    postmask_config(width, height);
    dither_config(width, height);
-	disp_config_main_path_connection();
-	disp_config_main_path_mutex();
+	disp_config_main_path_connection(path);
+	disp_config_main_path_mutex(path);
 }

static void disp_clock_on(void)
@@ -133,7 +145,7 @@
    write32p(SMI_LARB0 + SMI_LARB_PORT_L0_OVL_RDMA0, 0);
 }

-void mtk_ddp_mode_set(const struct edid *edid)
+void mtk_ddp_mode_set(const struct edid *edid, enum disp_path_sel path)
 {
    u32 fmt = OVL_INFMT_RGBA8888;
    u32 bpp = edid->framebuffer_bits_per_pixel / 8;
@@ -156,7 +168,7 @@
    	       __func__, vrefresh);
    }

-	main_disp_path_setup(width, height, vrefresh);
+	main_disp_path_setup(width, height, vrefresh, path);
    rdma_start();
    ovl_layer_config(fmt, bpp, width, height);
 }
diff --git a/src/soc/mediatek/mt8188/include/soc/ddp.h b/src/soc/mediatek/mt8188/include/soc/ddp.h
index 26f0151..475485e 100644
--- a/src/soc/mediatek/mt8188/include/soc/ddp.h
+++ b/src/soc/mediatek/mt8188/include/soc/ddp.h
@@ -82,7 +82,8 @@
    			  CG_CON0_DISP_AAL0 |
    			  CG_CON0_DISP_GAMMA0 |
    			  CG_CON0_DISP_DITHER0 |
-				  CG_CON0_DISP_DP_INTF0,
+				  CG_CON0_DISP_DP_INTF0 |
+				  CG_CON0_DISP_DSI0,
    CG_CON0_ALL		= 0xffffffff
 };

@@ -122,7 +123,8 @@
    CG_CON2_DPI_DPI0	= BIT(8),
    CG_CON2_DP_INTF0	= BIT(16),

-	CG_CON2_DISP_ALL	= CG_CON2_DP_INTF0,
+	CG_CON2_DISP_ALL	= CG_CON2_DSI_DSI0 |
+				  CG_CON2_DP_INTF0,
    CG_CON2_ALL		= 0xffffffff
 };

@@ -280,7 +282,12 @@
    SMI_LARB_PORT_L0_OVL_RDMA0	= 0xF88,
 };

+enum disp_path_sel {
+	DISP_PATH_EDP = 0,
+	DISP_PATH_MIPI,
+};
+
 void mtk_ddp_init(void);
-void mtk_ddp_mode_set(const struct edid *edid);
+void mtk_ddp_mode_set(const struct edid *edid, enum disp_path_sel);

#endif