summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorYidi Lin <yidilin@chromium.org>2024-01-02 17:33:00 +0800
committerFelix Held <felix-coreboot@felixheld.de>2024-01-10 14:20:56 +0000
commitcb7c4fdbd6c75d4ce9a2a5136b45f887bcf21d15 (patch)
tree989f2c24998f7ef78ad259a685daefa832524dc8 /src/soc
parentba604b558e3a4e9e53c948391bc86a7bc775e6b3 (diff)
mb/google/corsola: Use common mtk_display_init()
TEST=check FW screen on Steelix, Tentacruel and Starmie Change-Id: I429218d59389a6ab86b522dd597c07fa5b8ea821 Signed-off-by: Yidi Lin <yidilin@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/79777 Reviewed-by: Yu-Ping Wu <yupingso@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/mediatek/common/display.c6
-rw-r--r--src/soc/mediatek/mt8186/Makefile.inc2
-rw-r--r--src/soc/mediatek/mt8186/ddp.c2
-rw-r--r--src/soc/mediatek/mt8186/include/soc/ddp.h4
4 files changed, 10 insertions, 4 deletions
diff --git a/src/soc/mediatek/common/display.c b/src/soc/mediatek/common/display.c
index 72b7fe04bd..d51151ecab 100644
--- a/src/soc/mediatek/common/display.c
+++ b/src/soc/mediatek/common/display.c
@@ -37,6 +37,12 @@ static struct panel_serializable_data *get_mipi_cmd_from_cbfs(struct panel_descr
return NULL;
}
+__weak int mtk_edp_init(struct edid *edid)
+{
+ printk(BIOS_WARNING, "%s: Not supported\n", __func__);
+ return -1;
+}
+
int mtk_display_init(void)
{
struct edid edid;
diff --git a/src/soc/mediatek/mt8186/Makefile.inc b/src/soc/mediatek/mt8186/Makefile.inc
index 8fe923f294..3a3cc07ce6 100644
--- a/src/soc/mediatek/mt8186/Makefile.inc
+++ b/src/soc/mediatek/mt8186/Makefile.inc
@@ -38,6 +38,7 @@ ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += ../common/bl31.c
ramstage-y += ../common/ddp.c ddp.c
ramstage-y += ../common/devapc.c devapc.c
ramstage-y += ../common/dfd.c
+ramstage-y += ../common/display.c
ramstage-y += ../common/dsi.c ../common/mtk_mipi_dphy.c
ramstage-y += ../common/emi.c
ramstage-y += ../common/mcu.c
@@ -53,6 +54,7 @@ ramstage-y += ../common/tps65132s.c
ramstage-y += ../common/usb.c usb.c
CPPFLAGS_common += -Isrc/soc/mediatek/mt8186/include
+CPPFLAGS_common += -Isrc/soc/mediatek/common/dp/include
CPPFLAGS_common += -Isrc/soc/mediatek/common/include
BL31_MAKEARGS += PLAT=mt8186
diff --git a/src/soc/mediatek/mt8186/ddp.c b/src/soc/mediatek/mt8186/ddp.c
index 6706ed7d00..5a5f5447ff 100644
--- a/src/soc/mediatek/mt8186/ddp.c
+++ b/src/soc/mediatek/mt8186/ddp.c
@@ -141,7 +141,7 @@ void mtk_ddp_init(void)
write32((void *)(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;
diff --git a/src/soc/mediatek/mt8186/include/soc/ddp.h b/src/soc/mediatek/mt8186/include/soc/ddp.h
index e66563d9a0..f6e690a607 100644
--- a/src/soc/mediatek/mt8186/include/soc/ddp.h
+++ b/src/soc/mediatek/mt8186/include/soc/ddp.h
@@ -11,6 +11,7 @@
#include <device/mmio.h>
#include <soc/addressmap.h>
#include <soc/ddp_common.h>
+#include <soc/display.h>
#include <types.h>
#define SMI_LARB_PORT_L0_OVL_RDMA0 0x388
@@ -254,7 +255,4 @@ static struct disp_gamma_regs *const disp_gamma = (void *)DISP_GAMMA0_BASE;
static struct disp_postmask_regs *const disp_postmask = (void *)DISP_POSTMASK0_BASE;
static struct disp_dither_regs *const disp_dither = (void *)DISP_DITHER0_BASE;
-void mtk_ddp_init(void);
-void mtk_ddp_mode_set(const struct edid *edid);
-
#endif