coreboot-gerrit January 2025

coreboot-gerrit@coreboot.org

1 participants
3269 discussions

[M] Change in coreboot[main]: mb/amd/birman_plus: Kconfig
by Ana Carolina Cabral (Code Review) 21 Jan '25

21 Jan '25

Attention is currently required from: Ana Carolina Cabral. Hello Felix Held, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85493?usp=email to look at the new patch set (#16). The following approvals got outdated and were removed: Verified-1 by build bot (Jenkins) Change subject: mb/amd/birman_plus: Kconfig ...................................................................... mb/amd/birman_plus: Kconfig Rectify board configuration flags based on the schematics Doc. 105-D99700-00C and User Guide #58168 (NDA). Change-Id: Ia310ea616006479b9a052afb99d08df6a11431f4 Signed-off-by: Ana Carolina Cabral <ana.cabral(a)amd.com> --- M src/mainboard/amd/birman_plus/Kconfig M src/mainboard/amd/birman_plus/ec.c M src/mainboard/amd/birman_plus/port_descriptors_glinda.c 3 files changed, 38 insertions(+), 49 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/85493/16 -- To view, visit https://review.coreboot.org/c/coreboot/+/85493?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia310ea616006479b9a052afb99d08df6a11431f4 Gerrit-Change-Number: 85493 Gerrit-PatchSet: 16 Gerrit-Owner: Ana Carolina Cabral Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-CC: Nick Kochlowski <nickkochlowski(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Ana Carolina Cabral

1 0

[M] Change in coreboot[main]: mb/amd/birman_plus/ec: register bits
by Ana Carolina Cabral (Code Review) 21 Jan '25

21 Jan '25

Attention is currently required from: Ana Carolina Cabral. Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/86084?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by build bot (Jenkins) Change subject: mb/amd/birman_plus/ec: register bits ...................................................................... mb/amd/birman_plus/ec: register bits Rectify wrong EC module ECRAM registers bits based on PI source code 1.0.0.1b Change-Id: I1a13d99a55a4aa02a5cb0e67ffa4ed555f91a471 Signed-off-by: Ana Carolina Cabral <ana.cabral(a)amd.com> --- M src/mainboard/amd/birman_plus/ec.c 1 file changed, 31 insertions(+), 37 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/86084/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/86084?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I1a13d99a55a4aa02a5cb0e67ffa4ed555f91a471 Gerrit-Change-Number: 86084 Gerrit-PatchSet: 2 Gerrit-Owner: Ana Carolina Cabral Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Ana Carolina Cabral

1 0

[M] Change in coreboot[main]: mb/amd/birman_plus: Kconfig
by Ana Carolina Cabral (Code Review) 21 Jan '25

21 Jan '25

Attention is currently required from: Ana Carolina Cabral. Hello Felix Held, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85493?usp=email to look at the new patch set (#15). The following approvals got outdated and were removed: Verified-1 by build bot (Jenkins) Change subject: mb/amd/birman_plus: Kconfig ...................................................................... mb/amd/birman_plus: Kconfig Rectify board configuration flags based on the schematics Doc. 105-D99700-00C and User Guide #58168 (NDA). Change-Id: Ia310ea616006479b9a052afb99d08df6a11431f4 Signed-off-by: Ana Carolina Cabral <ana.cabral(a)amd.com> --- M src/mainboard/amd/birman_plus/Kconfig M src/mainboard/amd/birman_plus/ec.c M src/mainboard/amd/birman_plus/port_descriptors_glinda.c 3 files changed, 38 insertions(+), 44 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/85493/15 -- To view, visit https://review.coreboot.org/c/coreboot/+/85493?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia310ea616006479b9a052afb99d08df6a11431f4 Gerrit-Change-Number: 85493 Gerrit-PatchSet: 15 Gerrit-Owner: Ana Carolina Cabral Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-CC: Nick Kochlowski <nickkochlowski(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Ana Carolina Cabral

1 0

[XS] Change in coreboot[main]: soc/mediatek/mt8196: Fix issue with incomplete modem disable
by Yidi Lin (Code Review) 21 Jan '25

21 Jan '25

Yidi Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86069?usp=email ) Change subject: soc/mediatek/mt8196: Fix issue with incomplete modem disable ...................................................................... soc/mediatek/mt8196: Fix issue with incomplete modem disable If the modem is not completely disabled, it will cause issues with suspend to RAM. Update the condition check in MD1_PWR_STA and increased the MAX_RETRY_COUNT from 200 to 4000 to make sure that the modem has sufficient time to completely disable before proceeding. TEST=Measure the power and ensure that the DRAM enters self-refresh mode. BUG=b:377628718 Change-Id: I6e915d26e5b3caee36f4726bc2fc1c53cfc17bfc Signed-off-by: Jarried Lin <jarried.lin(a)mediatek.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/86069 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Yidi Lin <yidilin(a)google.com> Reviewed-by: Yu-Ping Wu <yupingso(a)google.com> --- M src/soc/mediatek/mt8196/modem_power_ctrl.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Yidi Lin: Looks good to me, approved Yu-Ping Wu: Looks good to me, approved diff --git a/src/soc/mediatek/mt8196/modem_power_ctrl.c b/src/soc/mediatek/mt8196/modem_power_ctrl.c index 0fc4653..f849efd 100644 --- a/src/soc/mediatek/mt8196/modem_power_ctrl.c +++ b/src/soc/mediatek/mt8196/modem_power_ctrl.c @@ -10,7 +10,7 @@ #include <soc/spmi.h> #define SPMI_SLAVE_4_750MV 0x78 -#define MAX_RETRY_COUNT 200 +#define MAX_RETRY_COUNT 4000 #define VSRAM_VOSEL 0x24d #define VMODEM_VOSEL 0x24e #define MD1_PWR_STA_MASK BIT(0) @@ -74,7 +74,7 @@ clrbits32(&mtk_spm->md1_pwr_con, PWR_ON); if (!retry(MAX_RETRY_COUNT, - read32(&mtk_spm->pwr_status) & MD1_PWR_STA_MASK)) { + (read32(&mtk_spm->pwr_status) & MD1_PWR_STA_MASK) == 0)) { printk(BIOS_ERR, "Check MD1_PWR_STA failed\n"); } -- To view, visit https://review.coreboot.org/c/coreboot/+/86069?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I6e915d26e5b3caee36f4726bc2fc1c53cfc17bfc Gerrit-Change-Number: 86069 Gerrit-PatchSet: 2 Gerrit-Owner: Jarried Lin <jarried.lin(a)mediatek.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[L] Change in coreboot[main]: soc/mediatek/mt8196: Add DDP driver
by Yidi Lin (Code Review) 21 Jan '25

21 Jan '25

Yidi Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85950?usp=email ) ( 11 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soc/mediatek/mt8196: Add DDP driver ...................................................................... soc/mediatek/mt8196: Add DDP driver Add DDP (display data pipe) driver that supports main path to eDP panel. TEST=build pass and firmware display ok BUG=b:343351631 Signed-off-by: Nancy Lin <nancy.lin(a)mediatek.corp-partner.google.com> Change-Id: I006911e83d940c1eec7135a6a0c36fbfa2aad466 Reviewed-on: https://review.coreboot.org/c/coreboot/+/85950 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Yu-Ping Wu <yupingso(a)google.com> Reviewed-by: Yidi Lin <yidilin(a)google.com> --- M src/soc/mediatek/mt8196/Makefile.mk A src/soc/mediatek/mt8196/ddp.c M src/soc/mediatek/mt8196/include/soc/addressmap.h A src/soc/mediatek/mt8196/include/soc/ddp.h A src/soc/mediatek/mt8196/include/soc/dsi.h 5 files changed, 802 insertions(+), 0 deletions(-) Approvals: Yu-Ping Wu: Looks good to me, approved build bot (Jenkins): Verified Yidi Lin: Looks good to me, approved diff --git a/src/soc/mediatek/mt8196/Makefile.mk b/src/soc/mediatek/mt8196/Makefile.mk index 27c3701..f5420ce 100644 --- a/src/soc/mediatek/mt8196/Makefile.mk +++ b/src/soc/mediatek/mt8196/Makefile.mk @@ -51,6 +51,8 @@ romstage-y += thermal_sram.c ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += ../common/bl31.c +ramstage-y += ddp.c +ramstage-y += ../common/display.c ramstage-y += ../common/dpm_v2.c ramstage-y += ../common/dp/dptx_common.c ../common/dp/dptx_hal_common.c ramstage-y += dptx.c dptx_hal.c dp_intf.c @@ -66,6 +68,7 @@ ramstage-y += ../common/mt6363.c mt6363.c ramstage-y += ../common/mt6363_sdmadc.c ramstage-y += ../common/mt6373.c mt6373.c +ramstage-y += mtcmos.c ramstage-y += ../common/mtk_fsp.c ramstage-y += soc.c ramstage-y += ../common/spm.c spm.c diff --git a/src/soc/mediatek/mt8196/ddp.c b/src/soc/mediatek/mt8196/ddp.c new file mode 100644 index 0000000..9453622 --- /dev/null +++ b/src/soc/mediatek/mt8196/ddp.c @@ -0,0 +1,312 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#include <console/console.h> +#include <device/mmio.h> +#include <edid.h> +#include <soc/addressmap.h> +#include <soc/ddp.h> + +#define SIZE(w, h) ((u32)(h) << 16 | (w)) + +static void blender_config(struct blender *reg, u16 width, u16 height, + enum mtk_disp_blender_layer type) +{ + setbits32(&reg->shadow_ctl, BIT(2)); + + switch (type) { + case FIRST_BLENDER: + clrsetbits32(&reg->datapath_con, BIT(4) | BIT(5), BIT(5)); + break; + case LAST_BLENDER: + clrsetbits32(&reg->datapath_con, BIT(0) | BIT(4) | BIT(5), BIT(0) | BIT(4)); + break; + case SINGLE_BLENDER: + clrsetbits32(&reg->datapath_con, BIT(4) | BIT(5), BIT(4)); + break; + case OTHER_BLENDER: + clrsetbits32(&reg->datapath_con, BIT(0) | BIT(4) | BIT(5), BIT(0) | BIT(5)); + break; + default: + printk(BIOS_ERR, "%s: unknown blender type %d\n", __func__, type); + break; + } + + write32(&reg->roi_size, SIZE(width, height)); + write32(&reg->bld_l_size, SIZE(width, height)); + write32(&reg->bg_clr, 0xFF000000); +} + +static void blender_start(struct blender *reg) +{ + setbits32(&reg->bld_en, BIT(0)); +} + +static void outproc_config(struct outproc *reg, u16 width, u16 height) +{ + setbits32(&reg->shadow_ctl, BIT(2)); + setbits32(&reg->datapath_con, BIT(26)); + write32(&reg->roi_size, SIZE(width, height)); +} + +static void outproc_start(struct outproc *reg) +{ + setbits32(&reg->outproc_en, BIT(0)); +} + +static void mdp_rsz_config(struct disp_mdp_rsz_regs *reg, u16 width, u16 height) +{ + write32(&reg->input_size, SIZE(width, height)); + write32(&reg->output_size, SIZE(width, height)); +} + +static void mdp_rsz_start(struct disp_mdp_rsz_regs *reg) +{ + clrbits32(&reg->en, BIT(0)); +} + +static void postmask_config(struct disp_postmask_regs *reg, u16 width, u16 height) +{ + write32(&reg->size, SIZE(width, height)); + setbits32(&reg->cfg, BIT(0)); +} + +static void postmask_start(struct disp_postmask_regs *reg) +{ + setbits32(&reg->en, BIT(0)); +} + +static void tdshp_config(struct disp_tdshp_regs *reg, u16 width, u16 height) +{ + write32(&reg->input_size, SIZE(width, height)); + write32(&reg->output_size, SIZE(width, height)); + write32(&reg->output_offset, 0x0); + write32(&reg->cfg, 0x1); + setbits32(&reg->tdshp_00, BIT(31)); +} + +static void tdshp_start(struct disp_tdshp_regs *reg) +{ + setbits32(&reg->ctrl, BIT(0)); +} + +static void ccorr_config(struct disp_ccorr_regs *reg, u16 width, u16 height) +{ + write32(&reg->size, SIZE(width, height)); + setbits32(&reg->cfg, BIT(1)); +} + +static void ccorr_start(struct disp_ccorr_regs *reg) +{ + setbits32(&reg->en, BIT(0)); +} + +static void gamma_config(struct disp_gamma_regs *reg, u16 width, u16 height) +{ + write32(&reg->size, SIZE(width, height)); +} + +static void gamma_start(struct disp_gamma_regs *reg) +{ + setbits32(&reg->en, BIT(0)); +} + +static void dither_config(struct disp_dither_regs *reg, u16 width, u16 height) +{ + write32(&reg->size, SIZE(width, height)); + setbits32(&reg->cfg, BIT(0)); +} + +static void dither_start(struct disp_dither_regs *reg) +{ + setbits32(&reg->en, BIT(0)); +} + +static void disp_config_main_path_connection(enum disp_path_sel path) +{ + /* ovlsys */ + setbits32(&ovlsys_cfg->bypass_mux_shadow, BIT(0)); + write32(&ovlsys_cfg->cb_con, 0xFF << 16); + setbits32(&ovlsys_cfg->rsz_in_cb2, BIT(1)); + setbits32(&ovlsys_cfg->exdma_out_cb3, BIT(2)); + setbits32(&ovlsys_cfg->blender_out_cb4, BIT(0)); + setbits32(&ovlsys_cfg->outproc_out_cb0, BIT(0)); + + /* dispsys */ + write32(&mmsys_cfg->bypass_mux_shadow, 0xFF << 16 | BIT(0)); + setbits32(&mmsys_cfg->pq_in_cb0, BIT(0)); + setbits32(&mmsys_cfg->disp_mdp_rsz0_mout, BIT(0)); + write32(&mmsys_cfg->disp_tdshp0_sout, 0x2); + write32(&mmsys_cfg->disp_ccorr0_sel, 0x2); + write32(&mmsys_cfg->disp_ccorr0_sout, 0x1); + write32(&mmsys_cfg->disp_ccorr1_sel, 0x1); + write32(&mmsys_cfg->disp_ccorr1_sout, 0x1); + write32(&mmsys_cfg->disp_gamma0_sel, 0x1); + write32(&mmsys_cfg->disp_postmask_sout, 0x0); + setbits32(&mmsys_cfg->pq_out_cb0, BIT(1)); + setbits32(&mmsys_cfg->panel_comp_out_cb1, BIT(1)); + + /* dispsys1 */ + write32(&mmsys1_cfg->bypass_mux_shadow, 0xFF << 16 | BIT(0)); + setbits32(&mmsys1_cfg->splitter_in_cb1, BIT(5)); + setbits32(&mmsys1_cfg->splitter_out_cb9, BIT(10)); + setbits32(&mmsys1_cfg->comp_out_cb6, BIT(0)); + if (path == DISP_PATH_EDP) + setbits32(&mmsys1_cfg->merge_out_cb0, BIT(9)); + else + setbits32(&mmsys1_cfg->merge_out_cb0, BIT(0)); +} + +static void async_config(u16 width, u16 height) +{ + write32(&ovlsys_cfg->relay5_size, SIZE(width, height)); + write32(&mmsys_cfg->dl_in_relay0, BIT(30) | SIZE(width, height)); + write32(&mmsys_cfg->dl_out_relay1, BIT(30) | SIZE(width, height)); + write32(&mmsys1_cfg->dl_in_relay21, BIT(30) | SIZE(width, height)); +} + +static void disp_config_main_path_mutex(enum disp_path_sel path) +{ + u32 val; + + /* ovlsys mutex */ + write32(&mmsys_mutex[OVL0]->mutex[0].mod, MUTEX_MOD_OVL_MAIN_PATH); + write32(&mmsys_mutex[OVL0]->mutex[0].mod1, MUTEX_MOD1_OVL_MAIN_PATH); + + /* dispsys mutex */ + write32(&mmsys_mutex[DISP0]->mutex[0].mod, MUTEX_MOD_DISP_MAIN_PATH); + write32(&mmsys_mutex[DISP0]->mutex[0].mod1, MUTEX_MOD1_DISP_MAIN_PATH); + + /* dispsys1 mutex */ + if (path == DISP_PATH_EDP) + write32(&mmsys_mutex[DISP1]->mutex[0].mod, MUTEX_MOD_DISP1_MAIN_PATH_EDP); + else + write32(&mmsys_mutex[DISP1]->mutex[0].mod, MUTEX_MOD_DISP1_MAIN_PATH_DSI0); + + /* mutex source from DVO */ + if (path == DISP_PATH_EDP) + val = MUTEX_SOF_DVO | (MUTEX_SOF_DVO << 7); + else + val = MUTEX_SOF_DSI0 | (MUTEX_SOF_DSI0 << 7); + write32(&mmsys_mutex[OVL0]->mutex[0].ctl, val); + write32(&mmsys_mutex[DISP0]->mutex[0].ctl, val); + write32(&mmsys_mutex[DISP1]->mutex[0].ctl, val); + + /* mutex enable */ + write32(&mmsys_mutex[OVL0]->mutex[0].en, BIT(0)); + write32(&mmsys_mutex[DISP0]->mutex[0].en, BIT(0)); + write32(&mmsys_mutex[DISP1]->mutex[0].en, BIT(0)); +} + +static void main_disp_path_setup(u16 width, u16 height, u32 vrefresh, enum disp_path_sel path) +{ + int i; + enum mtk_disp_blender_layer blender_type[ARRAY_SIZE(blenders)] = { + FIRST_BLENDER, + OTHER_BLENDER, + OTHER_BLENDER, + LAST_BLENDER, + }; + + /* ovlsys config */ + for (i = 0; i < ARRAY_SIZE(blenders); i++) { + blender_config(blenders[i], width, height, blender_type[i]); + blender_start(blenders[i]); + } + + outproc_config(outproc0_reg, width, height); + outproc_start(outproc0_reg); + + /* disp config */ + mdp_rsz_config(disp_mdp_rsz0_reg, width, height); + mdp_rsz_start(disp_mdp_rsz0_reg); + tdshp_config(disp_tdshp0_reg, width, height); + tdshp_start(disp_tdshp0_reg); + ccorr_config(disp_ccorr0_reg, width, height); + ccorr_start(disp_ccorr0_reg); + ccorr_config(disp_ccorr1_reg, width, height); + ccorr_start(disp_ccorr1_reg); + gamma_config(disp_gamma0_reg, width, height); + gamma_start(disp_gamma0_reg); + postmask_config(disp_postmask0_reg, width, height); + postmask_start(disp_postmask0_reg); + dither_config(disp_dither0_reg, width, height); + dither_start(disp_dither0_reg); + + /* async config */ + async_config(width, height); + + /* path connect */ + disp_config_main_path_connection(path); + + /* mutex config */ + disp_config_main_path_mutex(path); +} + +static void disp_clock_on(void) +{ + clrbits32(&mmsys_cfg->mmsys_cg_con0, CG_CON_ALL); + clrbits32(&mmsys_cfg->mmsys_cg_con1, CG_CON_ALL); + clrbits32(&mmsys_cfg->mmsys_cg_con2, CG_CON_ALL); + clrbits32(&mmsys1_cfg->mmsys_cg_con0, CG_CON_ALL); + clrbits32(&mmsys1_cfg->mmsys_cg_con1, CG_CON_ALL); + clrbits32(&mmsys1_cfg->mmsys_cg_con2, CG_CON_ALL); + clrbits32(&ovlsys_cfg->mmsys_cg_con0, CG_CON_ALL); + clrbits32(&ovlsys_cfg->mmsys_cg_con1, CG_CON_ALL); + clrbits32(&ovlsys_cfg->mmsys_cg_con2, CG_CON_ALL); +} + +static void ovlsys_layer_config(u32 fmt, u32 bpp, u16 width, u16 height) +{ + /* exdma config */ + write32(&exdma2_reg->roi_size, SIZE(width, height)); + write32(&exdma2_reg->ovl_l_size, SIZE(width, height)); + write32(&exdma2_reg->pitch, (width * bpp) & 0xFFFF); + write32(&exdma2_reg->ovl_l_clrfmt, fmt); + + /* exdma start */ + clrsetbits32(&exdma2_reg->rdma_burst_ctl, BIT(28) | BIT(30) | BIT(31), + BIT(28) | BIT(31)); + setbits32(&exdma2_reg->dummy, BIT(2) | BIT(3)); + setbits32(&exdma2_reg->datapath_con, BIT(0) | BIT(24) | BIT(25)); + clrsetbits32(&exdma2_reg->ovl_mout, BIT(0) | BIT(1), BIT(1)); + write32(&exdma2_reg->gdrdy_period, 0xFFFFFFFF); + + /* Enable layer */ + setbits32(&exdma2_reg->rdma0_ctl, BIT(0)); + setbits32(&blenders[0]->bld_l_fmt, fmt); +} + +void mtk_ddp_init(void) +{ + disp_clock_on(); +} + +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; + u32 width = edid->mode.ha; + u32 height = edid->mode.va; + u32 vrefresh = edid->mode.refresh; + + printk(BIOS_DEBUG, "%s: display resolution: %ux%u@%u bpp %u\n", __func__, width, height, + vrefresh, bpp); + + if (!vrefresh) { + if (!width || !height) + vrefresh = 60; + else + vrefresh = edid->mode.pixel_clock * 1000 / + ((width + edid->mode.hbl) * (height + edid->mode.vbl)); + + printk(BIOS_WARNING, "%s: vrefresh is not provided; using %u\n", __func__, + vrefresh); + } + + if (width > 0x1FFF || height > 0x1FFF) + printk(BIOS_WARNING, "%s: w/h: %d/%d exceed hw limit %u\n", __func__, + width, height, 0x1FFF); + + main_disp_path_setup(width, height, vrefresh, path); + ovlsys_layer_config(fmt, bpp, width, height); +} diff --git a/src/soc/mediatek/mt8196/include/soc/addressmap.h b/src/soc/mediatek/mt8196/include/soc/addressmap.h index 2582ee5..e04c01b 100644 --- a/src/soc/mediatek/mt8196/include/soc/addressmap.h +++ b/src/soc/mediatek/mt8196/include/soc/addressmap.h @@ -192,10 +192,27 @@ MMVOTE_BASE = IO_PHYS + 0x21B00000, MMPC_BASE = IO_PHYS + 0x21B50000, MMSYS_CONFIG_BASE = IO_PHYS + 0x22000000, + MMSYS_MUTEX_BASE = IO_PHYS + 0x22020000, + DISP_CCORR0_BASE = IO_PHYS + 0x22090000, + DISP_CCORR1_BASE = IO_PHYS + 0x220A0000, + DISP_COLOR0_BASE = IO_PHYS + 0x220F0000, + DISP_DITHER0_BASE = IO_PHYS + 0x22110000, + DISP_GAMMA0_BASE = IO_PHYS + 0x22130000, + DISP_POSTMASK0_BASE = IO_PHYS + 0x22180000, + DISP_MDP_RSZ0_BASE = IO_PHYS + 0x221A0000, + DISP_TDSHP0_BASE = IO_PHYS + 0x221E0000, MMSYS1_CONFIG_BASE = IO_PHYS + 0x22400000, + MMSYS1_MUTEX_BASE = IO_PHYS + 0x22420000, DSI0_BASE = IO_PHYS + 0x22490000, DISP_DVO0 = IO_PHYS + 0x224C0000, OVLSYS_CONFIG_BASE = IO_PHYS + 0x22800000, + OVLSYS_MUTEX_BASE = IO_PHYS + 0x22820000, + OVLSYS_EXDMA2_BASE = IO_PHYS + 0x22850000, + OVLSYS_BLENDER1_BASE = IO_PHYS + 0x228E0000, + OVLSYS_BLENDER2_BASE = IO_PHYS + 0x228F0000, + OVLSYS_BLENDER3_BASE = IO_PHYS + 0x22900000, + OVLSYS_BLENDER4_BASE = IO_PHYS + 0x22910000, + OVLSYS_OUTPROC0_BASE = IO_PHYS + 0x22970000, OVLSYS1_CONFIG_BASE = IO_PHYS + 0x22C00000, DISP_VDISP_AO_CONFIG_BASE = IO_PHYS + 0x2E800000, EDP_CLK_BASE = IO_PHYS + 0x21B50000, diff --git a/src/soc/mediatek/mt8196/include/soc/ddp.h b/src/soc/mediatek/mt8196/include/soc/ddp.h new file mode 100644 index 0000000..c2fbbb3 --- /dev/null +++ b/src/soc/mediatek/mt8196/include/soc/ddp.h @@ -0,0 +1,462 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#ifndef _SOC_MEDIATEK_MT8196_DDP_H_ +#define _SOC_MEDIATEK_MT8196_DDP_H_ + +#include <soc/addressmap.h> +#include <soc/display.h> +#include <types.h> + +#define CG_CON_ALL 0xFFFFFFFF + +struct ovlsys_cfg { + u32 reserved_0x000[64]; + u32 mmsys_cg_con0; + u32 mmsys_cg_set0; + u32 mmsys_cg_clr0; + u32 reserved_0x10c; + u32 mmsys_cg_con1; + u32 mmsys_cg_set1; + u32 mmsys_cg_clr1; + u32 reserved_0x11c; + u32 mmsys_cg_con2; + u32 mmsys_cg_set2; + u32 mmsys_cg_clr2; + u32 reserved_0x12c[92]; + u32 relay5_size; + u32 reserved_0x2a0[640]; + u32 bypass_mux_shadow; + u32 reserved_0xca4; + u32 reserved_0xca8; + u32 cb_con; + u32 reserved_0xcb0[88]; + u32 blender_out_cb4; + u32 reserved_0xe14; + u32 reserved_0xe18; + u32 reserved_0xe1c[17]; + u32 reserved_0xe60; + u32 reserved_0xe64; + u32 exdma_out_cb3; + u32 reserved_0xe6c[41]; + u32 outproc_out_cb0; + u32 reserved_0xf14; + u32 reserved_0xf18[22]; + u32 rsz_in_cb2; +}; + +check_member(ovlsys_cfg, mmsys_cg_con0, 0x100); +check_member(ovlsys_cfg, mmsys_cg_con1, 0x110); +check_member(ovlsys_cfg, mmsys_cg_con2, 0x120); +check_member(ovlsys_cfg, relay5_size, 0x29C); +check_member(ovlsys_cfg, bypass_mux_shadow, 0xCA0); +check_member(ovlsys_cfg, cb_con, 0xCAC); +check_member(ovlsys_cfg, blender_out_cb4, 0xE10); +check_member(ovlsys_cfg, exdma_out_cb3, 0xE68); +check_member(ovlsys_cfg, outproc_out_cb0, 0xF10); +check_member(ovlsys_cfg, rsz_in_cb2, 0xF70); + +static struct ovlsys_cfg *const ovlsys_cfg = (void *)OVLSYS_CONFIG_BASE; + +struct dispsys_cfg { + u32 reserved_0x000[64]; + u32 mmsys_cg_con0; + u32 mmsys_cg_set0; + u32 mmsys_cg_clr0; + u32 reserved_0x10c; + u32 mmsys_cg_con1; + u32 mmsys_cg_set1; + u32 mmsys_cg_clr1; + u32 reserved_0x11c; + u32 mmsys_cg_con2; + u32 mmsys_cg_set2; + u32 mmsys_cg_clr2; + u32 reserved_0x12c[53]; + u32 dl_in_relay0; + u32 reserved_0x204[25]; + u32 dl_out_relay1; + u32 reserved_0x26c[625]; + u32 bypass_mux_shadow; + u32 reserved_0xc34[61]; + u32 disp_ccorr0_sel; + u32 disp_ccorr0_sout; + u32 disp_ccorr1_sel; + u32 disp_ccorr1_sout; + u32 reserved_0xd38[8]; + u32 disp_gamma0_sel; + u32 reserved_0xd5c[3]; + u32 disp_postmask_sout; + u32 reserved_0xd6c; + u32 disp_tdshp0_sout; + u32 reserved_0xd74; + u32 disp_mdp_rsz0_mout; + u32 reserved_0xd7c[2]; + u32 panel_comp_out_cb1; + u32 reserved_0xd88[18]; + u32 pq_in_cb0; + u32 reserved_0xdd4[26]; + u32 pq_out_cb0; + u32 pq_out_cb1; + u32 pq_out_cb2; + u32 reserved_0xe40[3]; + u32 pq_out_cb6; +}; + +check_member(dispsys_cfg, mmsys_cg_con0, 0x100); +check_member(dispsys_cfg, mmsys_cg_con1, 0x110); +check_member(dispsys_cfg, mmsys_cg_con2, 0x120); +check_member(dispsys_cfg, dl_in_relay0, 0x200); +check_member(dispsys_cfg, dl_out_relay1, 0x268); +check_member(dispsys_cfg, bypass_mux_shadow, 0xC30); +check_member(dispsys_cfg, disp_ccorr0_sel, 0xD28); +check_member(dispsys_cfg, disp_gamma0_sel, 0xD58); +check_member(dispsys_cfg, disp_postmask_sout, 0xD68); +check_member(dispsys_cfg, disp_tdshp0_sout, 0xD70); +check_member(dispsys_cfg, panel_comp_out_cb1, 0xD84); +check_member(dispsys_cfg, pq_in_cb0, 0xDD0); +check_member(dispsys_cfg, pq_out_cb0, 0xE3C); +check_member(dispsys_cfg, pq_out_cb6, 0xE54); + +static struct dispsys_cfg *const mmsys_cfg = (void *)MMSYS_CONFIG_BASE; + +struct dispsys1_cfg { + u32 reserved_0x000[64]; + u32 mmsys_cg_con0; + u32 mmsys_cg_set0; + u32 mmsys_cg_clr0; + u32 reserved_0x10c; + u32 mmsys_cg_con1; + u32 mmsys_cg_set1; + u32 mmsys_cg_clr1; + u32 reserved_0x11c; + u32 mmsys_cg_con2; + u32 mmsys_cg_set2; + u32 mmsys_cg_clr2; + u32 reserved_0x12c[54]; + u32 dl_in_relay21; + u32 reserved_0x208[700]; + u32 bypass_mux_shadow; + u32 reserved_0xcfc[13]; + u32 comp_out_cb6; + u32 reserved_0xd34[38]; + u32 merge_out_cb0; + u32 reserved_0xdd0[55]; + u32 splitter_in_cb1; + u32 reserved_0xeb0[45]; + u32 splitter_out_cb9; +}; + +check_member(dispsys1_cfg, mmsys_cg_con0, 0x100); +check_member(dispsys1_cfg, mmsys_cg_con1, 0x110); +check_member(dispsys1_cfg, mmsys_cg_con2, 0x120); +check_member(dispsys1_cfg, dl_in_relay21, 0x204); +check_member(dispsys1_cfg, bypass_mux_shadow, 0xCF8); +check_member(dispsys1_cfg, comp_out_cb6, 0xD30); +check_member(dispsys1_cfg, merge_out_cb0, 0xDCC); +check_member(dispsys1_cfg, splitter_in_cb1, 0xEAC); +check_member(dispsys1_cfg, splitter_out_cb9, 0xF64); + +static struct dispsys1_cfg *const mmsys1_cfg = (void *)MMSYS1_CONFIG_BASE; + +struct exdma { + u32 reserved_0x000[5]; + u32 datapath_con; + u32 reserved_0x018[2]; + u32 ovl_en; + u32 reserved_0x024[3]; + u32 roi_size; + u32 reserved_0x034[3]; + u32 ovl_l_en; + u32 reserved_0x044; + u32 ovl_l_size; + u32 reserved_0x04c; + u32 ovl_l_clrfmt; + u32 reserved_0x054[43]; + u32 rdma0_ctl; + u32 reserved_0x104[60]; + u32 rdma_burst_ctl; + u32 reserved_0x1F8[2]; + u32 dummy; + u32 reserved_0x204; + u32 gdrdy_period; + u32 reserved_0x20c[57]; + u32 pitch_msb; + u32 pitch; + u32 reserved_0x2f8[2]; + u32 ovl_con; + u32 reserved_0x304[783]; + u32 ovl_addr; + u32 reserved_0xf44[43]; + u32 ovl_mout; +}; + +check_member(exdma, datapath_con, 0x014); +check_member(exdma, ovl_en, 0x020); +check_member(exdma, roi_size, 0x030); +check_member(exdma, ovl_l_en, 0x040); +check_member(exdma, ovl_l_size, 0x048); +check_member(exdma, ovl_l_clrfmt, 0x050); +check_member(exdma, rdma0_ctl, 0x100); +check_member(exdma, rdma_burst_ctl, 0x1F4); +check_member(exdma, dummy, 0x200); +check_member(exdma, gdrdy_period, 0x208); +check_member(exdma, pitch_msb, 0x2F0); +check_member(exdma, pitch, 0x2F4); +check_member(exdma, ovl_addr, 0xF40); +check_member(exdma, ovl_mout, 0xFF0); + +static struct exdma *const exdma2_reg = (void *)OVLSYS_EXDMA2_BASE; + +struct blender { + u32 reserved_0x000[4]; + u32 datapath_con; + u32 reserved_0x014[3]; + u32 bld_en; + u32 reserved_0x024; + u32 shadow_ctl; + u32 reserved_0x02c; + u32 roi_size; + u32 reserved_0x034[3]; + u32 bld_l_en; + u32 reserved_0x044; + u32 bld_l_size; + u32 reserved_0x04c; + u32 bld_l_fmt; + u32 reserved_0x054[44]; + u32 bg_clr; + u32 reserved_0x108[62]; + u32 bld_l_con2; +}; + +check_member(blender, datapath_con, 0x010); +check_member(blender, bld_en, 0x020); +check_member(blender, shadow_ctl, 0x028); +check_member(blender, roi_size, 0x030); +check_member(blender, bld_l_en, 0x040); +check_member(blender, bld_l_size, 0x048); +check_member(blender, bld_l_fmt, 0x050); +check_member(blender, bg_clr, 0x104); +check_member(blender, bld_l_con2, 0x200); + +static struct blender *const blenders[] = { + (void *)OVLSYS_BLENDER1_BASE, + (void *)OVLSYS_BLENDER2_BASE, + (void *)OVLSYS_BLENDER3_BASE, + (void *)OVLSYS_BLENDER4_BASE, +}; + +struct outproc { + u32 reserved_0x000[4]; + u32 datapath_con; + u32 reserved_0x014[3]; + u32 outproc_en; + u32 reserved_0x024; + u32 shadow_ctl; + u32 reserved_0x02c; + u32 roi_size; +}; + +check_member(outproc, datapath_con, 0x010); +check_member(outproc, outproc_en, 0x020); +check_member(outproc, shadow_ctl, 0x028); +check_member(outproc, roi_size, 0x030); + +static struct outproc *const outproc0_reg = (void *)OVLSYS_OUTPROC0_BASE; + +struct disp_mutex { + u32 inten; + u32 intsta; + u32 reserved0[6]; + struct { + u32 en; + u32 dummy; + u32 dummy1; + u32 rst; + u32 ctl; + u32 mod; + u32 mod1; + u32 reserved; + } mutex[12]; +}; + +enum mmsys { + DISP0, + DISP1, + OVL0, +}; + +static struct disp_mutex *const mmsys_mutex[] = { + [DISP0] = (void *)MMSYS_MUTEX_BASE, + [DISP1] = (void *)MMSYS1_MUTEX_BASE, + [OVL0] = (void *)OVLSYS_MUTEX_BASE, +}; + +enum { + OVL_INFMT_RGB565 = 0, + OVL_INFMT_RGB888 = 1, + OVL_INFMT_RGBA8888 = 2, + OVL_INFMT_ARGB8888 = 3, + OVL_INFMT_UYVY = 4, + OVL_INFMT_YUYV = 5, + OVL_INFMT_UNKNOWN = 16, +}; + +/* OVLSYS mutex module */ +enum { + MUTEX_MOD_OVL_EXDMA2 = BIT(2), + MUTEX_MOD_OVL_BLENDER1 = BIT(11), + MUTEX_MOD_OVL_BLENDER2 = BIT(12), + MUTEX_MOD_OVL_BLENDER3 = BIT(13), + MUTEX_MOD_OVL_BLENDER4 = BIT(14), + MUTEX_MOD_OVL_OUTPROC0 = BIT(20), + MUTEX_MOD_OVL_MAIN_PATH = MUTEX_MOD_OVL_EXDMA2 | + MUTEX_MOD_OVL_BLENDER1 | + MUTEX_MOD_OVL_BLENDER2 | + MUTEX_MOD_OVL_BLENDER3 | + MUTEX_MOD_OVL_BLENDER4 | + MUTEX_MOD_OVL_OUTPROC0, +}; + +enum { + MUTEX_MOD1_OVL_DLO_ASYNC5 = BIT(16), + MUTEX_MOD1_OVL_MAIN_PATH = MUTEX_MOD1_OVL_DLO_ASYNC5, +}; + +/* DISPSYS mutex module */ +enum { + MUTEX_MOD_DISP_CCORR0 = BIT(6), + MUTEX_MOD_DISP_CCORR1 = BIT(7), + MUTEX_MOD_DISP_DITHER0 = BIT(14), + MUTEX_MOD_DISP_DLI_ASYNC0 = BIT(16), + MUTEX_MOD_DISP_MAIN_PATH = MUTEX_MOD_DISP_DLI_ASYNC0 | + MUTEX_MOD_DISP_CCORR0 | + MUTEX_MOD_DISP_CCORR1 | + MUTEX_MOD_DISP_DITHER0, + +}; + +enum { + MUTEX_MOD1_DISP_DLO_ASYNC1 = BIT(1), + MUTEX_MOD1_DISP_GAMMA0 = BIT(9), + MUTEX_MOD1_DISP_POSTMASK0 = BIT(14), + MUTEX_MOD1_DISP_MDP_RSZ0 = BIT(18), + MUTEX_MOD1_DISP_TDSHP0 = BIT(21), + MUTEX_MOD1_DISP_MAIN_PATH = MUTEX_MOD1_DISP_MDP_RSZ0 | + MUTEX_MOD1_DISP_TDSHP0 | + MUTEX_MOD1_DISP_GAMMA0 | + MUTEX_MOD1_DISP_POSTMASK0 | + MUTEX_MOD1_DISP_DLO_ASYNC1, +}; + +/* DISPSYS1 mutex module */ +enum { + MUTEX_MOD_DISP1_DLI_ASYNC21 = BIT(1), + MUTEX_MOD_DISP1_DSI0 = BIT(23), + MUTEX_MOD_DISP1_DVO = BIT(29), + MUTEX_MOD_DISP1_MAIN_PATH_EDP = MUTEX_MOD_DISP1_DLI_ASYNC21 | + MUTEX_MOD_DISP1_DVO, + MUTEX_MOD_DISP1_MAIN_PATH_DSI0 = MUTEX_MOD_DISP1_DLI_ASYNC21 | + MUTEX_MOD_DISP1_DSI0, +}; + +enum { + MUTEX_SOF_SINGLE_MODE = 0, + MUTEX_SOF_DSI0 = 1, + MUTEX_SOF_DPI0 = 5, + MUTEX_SOF_DVO = 7, +}; + +enum mtk_disp_blender_layer { + FIRST_BLENDER, + LAST_BLENDER, + SINGLE_BLENDER, + OTHER_BLENDER, +}; + +struct disp_tdshp_regs { + u32 tdshp_00; + u32 reserved0[63]; + u32 ctrl; + u32 reserved1[3]; + u32 cfg; + u32 reserved2[3]; + u32 input_size; + u32 output_offset; + u32 output_size; +}; + +check_member(disp_tdshp_regs, output_size, 0x128); + +struct disp_ccorr_regs { + u32 en; + u32 reset; + u32 inten; + u32 intsta; + u32 status; + u32 reserved0[3]; + u32 cfg; + u32 reserved1[3]; + u32 size; + u32 reserved2[27]; + u32 shadow; +}; + +check_member(disp_ccorr_regs, shadow, 0xA0); + +struct disp_gamma_regs { + u32 en; + u32 reset; + u32 inten; + u32 intsta; + u32 status; + u32 reserved0[3]; + u32 cfg; + u32 reserved1[3]; + u32 size; +}; + +check_member(disp_gamma_regs, size, 0x30); + +struct disp_dither_regs { + u32 en; + u32 reset; + u32 inten; + u32 intsta; + u32 status; + u32 reserved0[3]; + u32 cfg; + u32 reserved1[3]; + u32 size; + u32 reserved2[51]; + u32 shadow; +}; + +check_member(disp_dither_regs, shadow, 0x100); + +struct disp_mdp_rsz_regs { + u32 en; + u32 reserved0[3]; + u32 input_size; + u32 output_size; +}; + +check_member(disp_mdp_rsz_regs, output_size, 0x14); + +struct disp_postmask_regs { + u32 en; + u32 reserved0[7]; + u32 cfg; + u32 reserved1[3]; + u32 size; +}; + +check_member(disp_postmask_regs, size, 0x30); + +static struct disp_mdp_rsz_regs *const disp_mdp_rsz0_reg = (void *)DISP_MDP_RSZ0_BASE; +static struct disp_postmask_regs *const disp_postmask0_reg = (void *)DISP_POSTMASK0_BASE; +static struct disp_tdshp_regs *const disp_tdshp0_reg = (void *)DISP_TDSHP0_BASE; +static struct disp_ccorr_regs *const disp_ccorr0_reg = (void *)DISP_CCORR0_BASE; +static struct disp_ccorr_regs *const disp_ccorr1_reg = (void *)DISP_CCORR1_BASE; +static struct disp_gamma_regs *const disp_gamma0_reg = (void *)DISP_GAMMA0_BASE; +static struct disp_dither_regs *const disp_dither0_reg = (void *)DISP_DITHER0_BASE; + +#endif diff --git a/src/soc/mediatek/mt8196/include/soc/dsi.h b/src/soc/mediatek/mt8196/include/soc/dsi.h new file mode 100644 index 0000000..07278c2 --- /dev/null +++ b/src/soc/mediatek/mt8196/include/soc/dsi.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#ifndef SOC_MEDIATEK_MT8196_DSI_H +#define SOC_MEDIATEK_MT8196_DSI_H + +#include <soc/dsi_common.h> + +#endif -- To view, visit https://review.coreboot.org/c/coreboot/+/85950?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I006911e83d940c1eec7135a6a0c36fbfa2aad466 Gerrit-Change-Number: 85950 Gerrit-PatchSet: 15 Gerrit-Owner: Jarried Lin <jarried.lin(a)mediatek.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Nancy Lin <nancy.lin(a)mediatek.corp-partner.google.com> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>

1 0

[XL] Change in coreboot[main]: soc/mediatek/mt8196: Add eDP driver
by Yidi Lin (Code Review) 21 Jan '25

21 Jan '25

Yidi Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85949?usp=email ) Change subject: soc/mediatek/mt8196: Add eDP driver ...................................................................... soc/mediatek/mt8196: Add eDP driver Add eDP driver to adjust training flow and turn off PHY power before PHY configuration to prevent potential link training failures. DISP_DVO is a highly advanced variant of DP_INTF block for eDP or HDMI or simply digital video output. DISP represents “display”, while DVO is the abbreviation of “digital video output”. This version of DISP_DVO is mainly designed for eDP1.5 protocol. TEST=check edp training pass and show log: EQ training pass BUG=b:343351631 Change-Id: Iccba53f6c6181ca84624c216f9641a2ae9041671 Signed-off-by: Bincai Liu <bincai.liu(a)mediatek.corp-partner.google.com> Signed-off-by: Yidi Lin <yidilin(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85949 Reviewed-by: Yu-Ping Wu <yupingso(a)google.com> Reviewed-by: Yidi Lin <yidilin(a)google.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/soc/mediatek/common/dp/include/soc/dptx_common.h M src/soc/mediatek/mt8196/Makefile.mk A src/soc/mediatek/mt8196/dp_intf.c A src/soc/mediatek/mt8196/dptx.c A src/soc/mediatek/mt8196/dptx_hal.c M src/soc/mediatek/mt8196/include/soc/addressmap.h A src/soc/mediatek/mt8196/include/soc/dp_intf.h A src/soc/mediatek/mt8196/include/soc/dptx.h A src/soc/mediatek/mt8196/include/soc/dptx_hal.h A src/soc/mediatek/mt8196/include/soc/dptx_reg.h 10 files changed, 1,452 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Yidi Lin: Looks good to me, approved Yu-Ping Wu: Looks good to me, approved diff --git a/src/soc/mediatek/common/dp/include/soc/dptx_common.h b/src/soc/mediatek/common/dp/include/soc/dptx_common.h index 3ed71a9..d3f7991 100644 --- a/src/soc/mediatek/common/dp/include/soc/dptx_common.h +++ b/src/soc/mediatek/common/dp/include/soc/dptx_common.h @@ -3,6 +3,7 @@ #ifndef SOC_MEDIATEK_COMMON_DP_DPTX_COMMON_H #define SOC_MEDIATEK_COMMON_DP_DPTX_COMMON_H +#define DP_LANSE_ADJUST_SIZE 2 #define DPTX_TBC_BUF_READSTARTADRTHRD 0x08 #define ENABLE_DPTX_EF_MODE 0x1 #define DPTX_AUX_SET_ENAHNCED_FRAME 0x80 diff --git a/src/soc/mediatek/mt8196/Makefile.mk b/src/soc/mediatek/mt8196/Makefile.mk index d8639c8..27c3701 100644 --- a/src/soc/mediatek/mt8196/Makefile.mk +++ b/src/soc/mediatek/mt8196/Makefile.mk @@ -52,6 +52,8 @@ ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += ../common/bl31.c ramstage-y += ../common/dpm_v2.c +ramstage-y += ../common/dp/dptx_common.c ../common/dp/dptx_hal_common.c +ramstage-y += dptx.c dptx_hal.c dp_intf.c ramstage-y += dramc_info.c ramstage-y += ../common/early_init.c ramstage-y += ../common/emi.c @@ -77,6 +79,7 @@ CPPFLAGS_common += -Isrc/soc/mediatek/mt8196/include CPPFLAGS_common += -Isrc/soc/mediatek/common/include +CPPFLAGS_common += -Isrc/soc/mediatek/common/dp/include MT8196_BLOB_DIR := 3rdparty/blobs/soc/mediatek/mt8196 diff --git a/src/soc/mediatek/mt8196/dp_intf.c b/src/soc/mediatek/mt8196/dp_intf.c new file mode 100644 index 0000000..38bac4e --- /dev/null +++ b/src/soc/mediatek/mt8196/dp_intf.c @@ -0,0 +1,192 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#include <assert.h> +#include <console/console.h> +#include <device/mmio.h> +#include <edid.h> +#include <soc/addressmap.h> +#include <soc/dp_intf.h> +#include <soc/pll.h> +#include <soc/spm.h> +#include <types.h> + +static const struct mtk_dvo_gs_info mtk_dvo_gs[MTK_DVO_GSL_MAX] = { + [MTK_DVO_FHD_60FPS_1920] = {6880, 511}, + [MTK_DVO_8K_30FPS] = {5255, 3899}, +}; + +static void mtk_dvo_mask(const struct mtk_dvo *dvo, u32 offset, u32 val, u32 mask) +{ + clrsetbits32(dvo->regs + offset, mask, val); +} + +static void mtk_dvo_sw_reset(const struct mtk_dvo *dvo, bool reset) +{ + mtk_dvo_mask(dvo, DVO_RET, reset ? SWRST : 0, SWRST); +} + +static void mtk_dvo_enable(const struct mtk_dvo *dvo) +{ + mtk_dvo_mask(dvo, DVO_EN, EN, EN); +} + +static void mtk_dvo_config_hsync(const struct mtk_dvo *dvo, + const struct mtk_dvo_sync_param *sync) +{ + mtk_dvo_mask(dvo, DVO_TGEN_H0, sync->sync_width << HSYNC_SHIFT, HSYNC_MASK); + mtk_dvo_mask(dvo, DVO_TGEN_H0, sync->front_porch << HFP_SHIFT, HFP_MASK); + mtk_dvo_mask(dvo, DVO_TGEN_H1, (sync->back_porch + sync->sync_width) << HSYNC2ACT_SHIFT, + HSYNC2ACT_MASK); +} + +static void mtk_dvo_config_vsync(const struct mtk_dvo *dvo, + const struct mtk_dvo_sync_param *sync, + u32 width_addr, u32 porch_addr) +{ + mtk_dvo_mask(dvo, width_addr, sync->sync_width << VSYNC_SHIFT, VSYNC_MASK); + mtk_dvo_mask(dvo, width_addr, sync->front_porch << VFP_SHIFT, VFP_MASK); + mtk_dvo_mask(dvo, porch_addr, (sync->back_porch + sync->sync_width) << VSYNC2ACT_SHIFT, + VSYNC2ACT_MASK); +} + +static void mtk_dvo_config_vsync_lodd(const struct mtk_dvo *dvo, + struct mtk_dvo_sync_param *sync) +{ + mtk_dvo_config_vsync(dvo, sync, DVO_TGEN_V0, DVO_TGEN_V1); +} + +static void mtk_dvo_config_interface(const struct mtk_dvo *dvo, bool inter) +{ + mtk_dvo_mask(dvo, DVO_CON, inter ? INTL_EN : 0, INTL_EN); +} + +static void mtk_dvo_config_fb_size(const struct mtk_dvo *dvo, u32 width, u32 height) +{ + mtk_dvo_mask(dvo, DVO_SRC_SIZE, width << SRC_HSIZE_SHIFT, SRC_HSIZE_MASK); + mtk_dvo_mask(dvo, DVO_SRC_SIZE, height << SRC_VSIZE_SHIFT, PIC_VSIZE_MASK); + + mtk_dvo_mask(dvo, DVO_PIC_SIZE, width << PIC_HSIZE_SHIFT, PIC_HSIZE_MASK); + mtk_dvo_mask(dvo, DVO_PIC_SIZE, height << PIC_VSIZE_SHIFT, PIC_VSIZE_MASK); + + mtk_dvo_mask(dvo, DVO_TGEN_H1, (width / 4) << HACT_SHIFT, HACT_MASK); + mtk_dvo_mask(dvo, DVO_TGEN_V1, height << VACT_SHIFT, VACT_MASK); +} + +static void mtk_dvo_irq_enable(const struct mtk_dvo *dvo) +{ + mtk_dvo_mask(dvo, DVO_INTEN, INT_VDE_END_EN, INT_VDE_END_EN); +} + +static void mtk_dvo_info_queue_start(const struct mtk_dvo *dvo) +{ + mtk_dvo_mask(dvo, DVO_TGEN_INFOQ_LATENCY, 0, + INFOQ_START_LATENCY_MASK | INFOQ_END_LATENCY_MASK); +} + +static void mtk_dvo_buffer_ctrl(const struct mtk_dvo *dvo) +{ + mtk_dvo_mask(dvo, DVO_BUF_CON0, DISP_BUF_EN, DISP_BUF_EN); + mtk_dvo_mask(dvo, DVO_BUF_CON0, FIFO_UNDERFLOW_DONE_BLOCK, FIFO_UNDERFLOW_DONE_BLOCK); +} + +static void mtk_dvo_trailing_blank_setting(const struct mtk_dvo *dvo) +{ + mtk_dvo_mask(dvo, DVO_TGEN_V_LAST_TRAILING_BLANK, 0x20 << V_LAST_TRAILING_BLANK, + V_LAST_TRAILING_BLANK_MASK); + mtk_dvo_mask(dvo, DVO_TGEN_OUTPUT_DELAY_LINE, 0x20 << EXT_TG_DLY_LINE, + EXT_TG_DLY_LINE_MASK); +} + +static void mtk_dvo_golden_setting(const struct mtk_dvo *dvo) +{ + assert(dvo->gs_level < MTK_DVO_GSL_MAX); + + printk(BIOS_INFO, "[eDPTX] gs_level %d sodi %d %d\n", dvo->gs_level, + mtk_dvo_gs[dvo->gs_level].dvo_buf_sodi_high, + mtk_dvo_gs[dvo->gs_level].dvo_buf_sodi_low); + + mtk_dvo_mask(dvo, DVO_BUF_SODI_HIGHT, + mtk_dvo_gs[dvo->gs_level].dvo_buf_sodi_high, 0xFFFFFFFF); + mtk_dvo_mask(dvo, DVO_BUF_SODI_LOW, + mtk_dvo_gs[dvo->gs_level].dvo_buf_sodi_low, 0xFFFFFFFF); +} + +static void mtk_dvo_shadow_ctrl(const struct mtk_dvo *dvo) +{ + mtk_dvo_mask(dvo, DVO_SHADOW_CTRL, 0, BYPASS_SHADOW); + mtk_dvo_mask(dvo, DVO_SHADOW_CTRL, FORCE_COMMIT, FORCE_COMMIT); +} + +static int mtk_dvo_power_on(const struct mtk_dvo *dvo, const struct edid *edid) +{ + u32 clksrc; + u32 pll_rate; + + if (edid->mode.pixel_clock < 70000) + clksrc = TVDPLL_D16; + else if (edid->mode.pixel_clock < 200000) + clksrc = TVDPLL_D8; + else + clksrc = TVDPLL_D4; + + pll_rate = edid->mode.pixel_clock * 1000 * (1 << (clksrc + 1)); + + mt_pll_set_tvd_pll1_freq(pll_rate / 4); + mt_pll_edp_mux_set_sel(clksrc); + printk(BIOS_INFO, "[eDPTX] dvo pll=%u clksrc=%u\n", pll_rate, clksrc); + mtk_dvo_enable(dvo); + + return 0; +} + +static int mtk_dvo_set_display_mode(const struct mtk_dvo *dvo, const struct edid *edid) +{ + struct mtk_dvo_sync_param hsync = {0}; + struct mtk_dvo_sync_param vsync_lodd = {0}; + + vsync_lodd.sync_width = edid->mode.vspw; + vsync_lodd.front_porch = edid->mode.vso - edid->mode.vborder; + vsync_lodd.back_porch = + edid->mode.vbl - edid->mode.vso - edid->mode.vspw - edid->mode.vborder; + + hsync.sync_width = edid->mode.hspw / 4; + hsync.front_porch = (edid->mode.hso - edid->mode.hborder) / 4; + hsync.back_porch = + (edid->mode.hbl - edid->mode.hso - edid->mode.hspw - edid->mode.hborder) / 4; + + mtk_dvo_sw_reset(dvo, true); + mtk_dvo_irq_enable(dvo); + + mtk_dvo_config_hsync(dvo, &hsync); + mtk_dvo_config_vsync_lodd(dvo, &vsync_lodd); + + mtk_dvo_config_interface(dvo, false); + mtk_dvo_config_fb_size(dvo, edid->mode.ha, edid->mode.va); + + mtk_dvo_info_queue_start(dvo); + mtk_dvo_buffer_ctrl(dvo); + mtk_dvo_trailing_blank_setting(dvo); + + mtk_dvo_golden_setting(dvo); + + mtk_dvo_shadow_ctrl(dvo); + + mtk_dvo_mask(dvo, DVO_OUTPUT_SET, 0x2, OUT_NP_SEL); + mtk_dvo_sw_reset(dvo, false); + + return 0; +} + +static const struct mtk_dvo dvo_data = { + .regs = (void *)DISP_DVO0, + .gs_level = MTK_DVO_8K_30FPS, +}; + +void dp_intf_config(const struct edid *edid) +{ + const struct mtk_dvo *data = &dvo_data; + + printk(BIOS_INFO, "[eDPTX] dvo begin\n"); + mtk_dvo_power_on(data, edid); + mtk_dvo_set_display_mode(data, edid); +} diff --git a/src/soc/mediatek/mt8196/dptx.c b/src/soc/mediatek/mt8196/dptx.c new file mode 100644 index 0000000..926850a --- /dev/null +++ b/src/soc/mediatek/mt8196/dptx.c @@ -0,0 +1,409 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#include <assert.h> +#include <commonlib/bsd/helpers.h> +#include <console/console.h> +#include <delay.h> +#include <device/mmio.h> +#include <edid.h> +#include <soc/addressmap.h> +#include <soc/dp_intf.h> +#include <soc/dptx.h> +#include <soc/dptx_hal.h> +#include <soc/dptx_reg.h> + +static void mtk_edp_pattern(struct mtk_dp *mtk_dp, u8 lane_count, u8 pattern) +{ + u8 aux_offset; + + switch (pattern) { + case DPTX_PATTERN_TPS1: + aux_offset = DP_TRAINING_PATTERN_1 | DP_LINK_SCRAMBLING_DISABLE; + dptx_hal_phy_set_idle_pattern(mtk_dp, lane_count, false); + mtk_dp_mask(mtk_dp, REG_3400_DP_TRANS_P0, PATTERN1_EN_DP_TRANS_4P_TPS1, + PATTERN_EN_DP_TRANS_4P_MASK); + break; + case DPTX_PATTERN_TPS2: + aux_offset = DP_TRAINING_PATTERN_2 | DP_LINK_SCRAMBLING_DISABLE; + mtk_dp_mask(mtk_dp, REG_3400_DP_TRANS_P0, PATTERN2_EN_DP_TRANS_4P_TPS2, + PATTERN_EN_DP_TRANS_4P_MASK); + break; + case DPTX_PATTERN_TPS3: + aux_offset = DP_TRAINING_PATTERN_3 | DP_LINK_SCRAMBLING_DISABLE; + mtk_dp_mask(mtk_dp, REG_3400_DP_TRANS_P0, PATTERN3_EN_DP_TRANS_4P_TPS3, + PATTERN_EN_DP_TRANS_4P_MASK); + break; + case DPTX_PATTERN_TPS4: + aux_offset = DP_TRAINING_PATTERN_4; + mtk_dp_mask(mtk_dp, REG_3400_DP_TRANS_P0, PATTERN4_EN_DP_TRANS_4P_TPS4, + PATTERN_EN_DP_TRANS_4P_MASK); + break; + case DPTX_PATTERN_UNKNOWN: + default: + printk(BIOS_ERR, "Set default or unknown pattern\n"); + mtk_dp_mask(mtk_dp, REG_3400_DP_TRANS_P0, 0x0, PATTERN_EN_DP_TRANS_4P_MASK); + return; + } + + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00102, 0x1, &aux_offset); +} + +static void update_swing_preemphasis(struct mtk_dp *mtk_dp, u8 lane_count, + u8 dpcd_adjust_req[DP_LANSE_ADJUST_SIZE]) +{ + u8 swing_val[MAX_LANECOUNT]; + u8 preemphasis[MAX_LANECOUNT]; + + for (int lane = 0; lane < lane_count; lane++) { + u8 val; + int index = lane / 2; + assert(index < DP_LANSE_ADJUST_SIZE); + int shift = lane % 2 ? DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT : 0; + u8 swing_value = dpcd_adjust_req[index] >> shift; + + swing_val[lane] = swing_value & DP_ADJUST_VOLTAGE_SWING_LANE0_MASK; + preemphasis[lane] = swing_value & DP_ADJUST_PRE_EMPHASIS_LANE0_MASK; + preemphasis[lane] >>= DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT; + val = swing_val[lane] << DP_TRAIN_VOLTAGE_SWING_SHIFT | + preemphasis[lane] << DP_TRAIN_PRE_EMPHASIS_SHIFT; + + if (swing_val[lane] == DPTX_SWING3) + val |= DP_TRAIN_MAX_SWING_REACHED; + if (preemphasis[lane] == DPTX_PREEMPHASIS3) + val |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED; + + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00103 + lane, 0x1, &val); + } + + dptx_hal_phy_set_swing_preemphasis(mtk_dp, lane_count, swing_val, preemphasis); +} + +static void dptx_training_changemode(struct mtk_dp *mtk_dp) +{ + dptx_hal_phyd_reset(mtk_dp); + dptx_hal_swing_emp_reset(mtk_dp); + + mdelay(2); +} + +static void mtk_edp_train_setting(struct mtk_dp *mtk_dp, + u8 linkrate, u8 lanecount) +{ + u8 lanecount_enhanced_frame; + u8 dpcd_data; + + lanecount_enhanced_frame = lanecount | DP_LANE_COUNT_ENHANCED_FRAME_EN; + + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00100, 0x1, &linkrate); + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00101, 0x1, + &lanecount_enhanced_frame); + if (mtk_dp->train_info.sink_ssc_en) { + dpcd_data = DP_SPREAD_AMP_0_5; + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00107, 0x1, &dpcd_data); + dptx_hal_ssc_en(mtk_dp, true); + } else { + dpcd_data = 0x0; + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00107, 0x1, &dpcd_data); + dptx_hal_ssc_en(mtk_dp, false); + } + dptx_hal_set_txlane(mtk_dp, lanecount / 2); + dptx_hal_phy_setting(mtk_dp); + + printk(BIOS_INFO, "Link train linkrate = %#x, lanecount = %#x\n", + linkrate, lanecount); +} + +static void drm_dp_dpcd_read_link_status(struct mtk_dp *mtk_dp, u8 status[DP_LINK_STATUS_SIZE]) +{ + dptx_auxread_dpcd(mtk_dp, DP_AUX_NATIVE_READ, DPCD_00202, DP_LINK_STATUS_SIZE, status); +} + +static int mtk_edp_train_cr(struct mtk_dp *mtk_dp, u8 lane_count) +{ + u8 lane_adjust[DP_LANSE_ADJUST_SIZE]; + u8 link_status[DP_LINK_STATUS_SIZE]; + u8 prev_lane_adjust = 0xff; + int train_retries = 0; + int voltage_retries = 0; + u8 buff; + + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_TPS1); + + /* In DP spec 1.4, the retry count of CR is defined as 10. */ + do { + train_retries++; + if (!dptx_hal_hpd_high(mtk_dp)) { + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_UNKNOWN); + return DPTX_TRANING_FAIL; + } + + dptx_auxread_dpcd(mtk_dp, DP_AUX_NATIVE_READ, DPCD_00206, sizeof(lane_adjust), + lane_adjust); + printk(BIOS_DEBUG, "[aux_read] dpcd206 lane_adjust[0]=%#x\n", lane_adjust[0]); + printk(BIOS_DEBUG, "[aux_read] dpcd207 lane_adjust[1]=%#x\n", lane_adjust[1]); + update_swing_preemphasis(mtk_dp, lane_count, lane_adjust); + + dptx_link_train_clock_recovery_delay(mtk_dp->rx_cap); + + /* Check link status from sink device */ + drm_dp_dpcd_read_link_status(mtk_dp, link_status); + if (dptx_clock_recovery_ok(link_status, lane_count)) { + printk(BIOS_INFO, "Link train CR pass\n"); + return 0; + } + + /* + * In DP spec 1.4, if current voltage level is the same + * with previous voltage level, we need to retry 5 times. + */ + if (prev_lane_adjust == link_status[4]) { + voltage_retries++; + /* + * Condition of CR fail: + * 1. Failed to pass CR using the same voltage + * level over five times. + * 2. Failed to pass CR when the current voltage + * level is the same with previous voltage + * level and reach max voltage level (3). + */ + if (voltage_retries > MTK_DP_TRAIN_VOLTAGE_LEVEL_RETRY || + (prev_lane_adjust & DP_ADJUST_VOLTAGE_SWING_LANE0_MASK) == 3) { + printk(BIOS_ERR, "Link train CR fail\n"); + break; + } + } else { + /* + * If the voltage level is changed, we need to + * re-calculate this retry count. + */ + voltage_retries = 0; + } + prev_lane_adjust = link_status[4]; + printk(BIOS_INFO, "CR training retries %d\n", voltage_retries); + } while (train_retries < MTK_DP_TRAIN_DOWNSCALE_RETRY); + + /* Failed to train CR, and disable pattern. */ + buff = DP_TRAINING_PATTERN_DISABLE; + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00102, 0x1, &buff); + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_UNKNOWN); + + return DPTX_TRANING_FAIL; +} + +static int mtk_edp_train_eq(struct mtk_dp *mtk_dp, u8 lane_count) +{ + u8 lane_adjust[2]; + u8 link_status[DP_LINK_STATUS_SIZE]; + int train_retries = 0; + u8 buff; + + if (mtk_dp->train_info.tps4) + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_TPS4); + else if (mtk_dp->train_info.tps3) + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_TPS3); + else + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_TPS2); + + do { + train_retries++; + if (!dptx_hal_hpd_high(mtk_dp)) { + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_UNKNOWN); + return DPTX_TRANING_FAIL; + } + + dptx_auxread_dpcd(mtk_dp, DP_AUX_NATIVE_READ, DPCD_00206, sizeof(lane_adjust), + lane_adjust); + printk(BIOS_DEBUG, "[aux_read] dpcd206 lane_adjust[0]=%#x\n", lane_adjust[0]); + printk(BIOS_DEBUG, "[aux_read] dpcd207 lane_adjust[1]=%#x\n", lane_adjust[1]); + update_swing_preemphasis(mtk_dp, lane_count, lane_adjust); + + dptx_link_train_channel_eq_delay(mtk_dp->rx_cap); + + /* check link status from sink device */ + drm_dp_dpcd_read_link_status(mtk_dp, link_status); + if (dptx_channel_eq_ok(link_status, lane_count)) { + printk(BIOS_DEBUG, "Link train EQ pass\n"); + + /* Training done, and disable pattern. */ + buff = DP_TRAINING_PATTERN_DISABLE; + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00102, 0x1, &buff); + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_UNKNOWN); + return 0; + } + printk(BIOS_INFO, "Link train EQ fail retry:%d\n", train_retries); + } while (train_retries < MTK_DP_TRAIN_DOWNSCALE_RETRY); + + /* Failed to train EQ, and disable pattern. */ + buff = DP_TRAINING_PATTERN_DISABLE; + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00102, 0x1, &buff); + mtk_edp_pattern(mtk_dp, lane_count, DPTX_PATTERN_UNKNOWN); + + return DPTX_TIMEOUT; +} + +static int dptx_set_trainingstart(struct mtk_dp *mtk_dp) +{ + u8 lanecount; + u8 linkrate; + u8 buffer; + u8 train_limit; + u8 max_linkrate; + int ret; + + buffer = 0x1; + dptx_auxwrite_dpcd(mtk_dp, DP_AUX_NATIVE_WRITE, DPCD_00600, 0x1, &buffer); + + linkrate = mtk_dp->rx_cap[1]; + lanecount = mtk_dp->rx_cap[2] & 0x1F; + + printk(BIOS_INFO, "RX support linkrate = %#x, lanecount = %#x\n", linkrate, lanecount); + + if (mtk_dp->train_info.sink_extcap_en) + dptx_auxread_dpcd(mtk_dp, DP_AUX_NATIVE_READ, DPCD_02002, 0x1, &buffer); + else + dptx_auxread_dpcd(mtk_dp, DP_AUX_NATIVE_READ, DPCD_00200, 0x1, &buffer); + + if ((buffer & 0xBF) != 0) + mtk_dp->train_info.sink_count_num = buffer & 0xBF; + + dptx_hal_setscramble(mtk_dp, false); + switch (linkrate) { + case DP_LINKRATE_RBR: + case DP_LINKRATE_HBR: + case DP_LINKRATE_HBR2: + case DP_LINKRATE_HBR25: + case DP_LINKRATE_HBR3: + break; + default: + mtk_dp->train_info.linkrate = DP_LINKRATE_HBR3; + break; + }; + + max_linkrate = linkrate; + printk(BIOS_INFO, "[eDPTX] linkrate = %#x, lanecount = %#x\n", linkrate, lanecount); + for (train_limit = 6; train_limit > 0; train_limit--) { + dptx_training_changemode(mtk_dp); + + mtk_edp_train_setting(mtk_dp, linkrate, lanecount); + ret = mtk_edp_train_cr(mtk_dp, lanecount); + if (ret == DPTX_TRANING_FAIL) { + return ret; + } else if (ret) { + /* Reduce link rate */ + switch (linkrate) { + case DP_LINKRATE_RBR: + lanecount = lanecount / 2; + linkrate = max_linkrate; + + if (lanecount == 0) + return DPTX_TRANING_FAIL; + break; + case DP_LINKRATE_HBR: + linkrate = DP_LINKRATE_RBR; + break; + case DP_LINKRATE_HBR2: + linkrate = DP_LINKRATE_HBR; + break; + case DP_LINKRATE_HBR3: + linkrate = DP_LINKRATE_HBR2; + break; + default: + return DPTX_TRANING_FAIL; + } + continue; + } + + ret = mtk_edp_train_eq(mtk_dp, lanecount); + if (ret == DPTX_TIMEOUT) { + return DPTX_TIMEOUT; + } else if (ret) { + /* Reduce lane count */ + if (lanecount == DP_LANECOUNT_4) + lanecount = DP_LANECOUNT_2; + else if (lanecount == DP_LANECOUNT_2) + lanecount = DP_LANECOUNT_1; + else + return DPTX_TRANING_FAIL; + continue; + } + printk(BIOS_INFO, "[eDPTX] EQ training pass\n"); + /* If we reach here, training is done. */ + break; + } + + if (train_limit == 0) + return DPTX_TRANING_FAIL; + + mtk_dp->train_info.linkrate = linkrate; + mtk_dp->train_info.linklane_count = lanecount; + /* + * After training done, we need to output normal stream instead of TPS, + * so we need to enable scramble. + */ + dptx_hal_setscramble(mtk_dp, true); + dptx_hal_set_ef_mode(mtk_dp, ENABLE_DPTX_EF_MODE); + + printk(BIOS_INFO, "%s: done\n", __func__); + + return DPTX_PASS; +} + +static void dptx_init_port(struct mtk_dp *mtk_dp) +{ + dptx_hal_phy_setidlepattern(mtk_dp, true); + dptx_hal_init_setting(mtk_dp); + dptx_hal_aux_setting(mtk_dp); + dptx_hal_digital_setting(mtk_dp); + dptx_hal_phy_init(mtk_dp); + dptx_hal_phy_setting(mtk_dp); + dptx_hal_hpd_detect_setting(mtk_dp); + + dptx_hal_digital_swreset(mtk_dp); + + dptx_hal_analog_power_en(mtk_dp, true); + dptx_hal_hpd_int_en(mtk_dp, true); +} + +int mtk_edp_init(struct mtk_dp *mtk_dp, struct edid *edid) +{ + write32p(EDP_CLK_BASE + DISP_EDPTX_PWR_CON, 0xC2FC224D); + /* Add 26Mhz clock */ + write32p(CKSYS_GP2_BASE + CKSYS2_CLK_CFG_3_CLR, 0xFF000000); + write32p(CKSYS_GP2_BASE + CKSYS2_CLK_CFG_UPDATE, 0x00008000); + udelay(50); + dptx_init_variable(mtk_dp); + dptx_init_port(mtk_dp); + + if (!dptx_hal_hpd_high(mtk_dp)) { + printk(BIOS_ERR, "HPD is low\n"); + return -1; + } + + dptx_check_sinkcap(mtk_dp); + + if (dptx_get_edid(mtk_dp, edid) != 0) { + printk(BIOS_ERR, "Failed to get EDID\n"); + return -1; + } + + if (dptx_set_trainingstart(mtk_dp) != DPTX_PASS) { + printk(BIOS_ERR, "%s: Failed to set training start\n", __func__); + return -1; + } + + dp_intf_config(edid); + dptx_video_config(mtk_dp); + + return 0; +} + + +int mtk_edp_enable(struct mtk_dp *mtk_dp) +{ + if (!mtk_dp) { + printk(BIOS_ERR, "%s: eDP is not initialized\n", __func__); + return -1; + } + dptx_video_enable(mtk_dp, true); + return 0; +} diff --git a/src/soc/mediatek/mt8196/dptx_hal.c b/src/soc/mediatek/mt8196/dptx_hal.c new file mode 100644 index 0000000..168d62b --- /dev/null +++ b/src/soc/mediatek/mt8196/dptx_hal.c @@ -0,0 +1,387 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#include <assert.h> +#include <console/console.h> +#include <device/mmio.h> +#include <delay.h> +#include <edid.h> +#include <soc/dptx.h> +#include <soc/dptx_hal.h> +#include <soc/dptx_reg.h> +#include <types.h> + +static const int driving_offset[] = { + PHYD_DIG_LAN0_OFFSET + DRIVING_FORCE, + PHYD_DIG_LAN1_OFFSET + DRIVING_FORCE, + PHYD_DIG_LAN2_OFFSET + DRIVING_FORCE, + PHYD_DIG_LAN3_OFFSET + DRIVING_FORCE, +}; + +void dptx_hal_init_setting(struct mtk_dp *mtk_dp) +{ + mtk_dp_mask(mtk_dp, 0x2000, GENMASK(1, 0), GENMASK(1, 0)); + + mtk_dp_mask(mtk_dp, REG_3540_DP_TRANS_P0, BIT(3), BIT(3)); + mtk_dp_mask(mtk_dp, REG_342C_DP_TRANS_P0, 0x68, 0xFF); + mtk_dp_mask(mtk_dp, REG_31EC_DP_ENCODER0_P0, BIT(4), BIT(4)); + mtk_dp_mask(mtk_dp, REG_304C_DP_ENCODER0_P0, 0, BIT(8)); + mtk_dp_mask(mtk_dp, REG_304C_DP_ENCODER0_P0, BIT(3), BIT(3)); + + /* default marker */ + mtk_dp_mask(mtk_dp, REG_3F04_DP_ENC_4P_3, 0, 0xFFFF); + mtk_dp_mask(mtk_dp, REG_3F08_DP_ENC_4P_3, BIT(3), BIT(3)); + mtk_dp_mask(mtk_dp, REG_3F0C_DP_ENC_4P_3, BIT(1), BIT(1)); + mtk_dp_mask(mtk_dp, REG_3F10_DP_ENC_4P_3, BIT(3), BIT(3)); + + mtk_dp_mask(mtk_dp, REG_33C0_DP_ENCODER1_P0, 0, 0xF000); + mtk_dp_mask(mtk_dp, REG_33C0_DP_ENCODER1_P0, 0x80, 0x80); + mtk_dp_mask(mtk_dp, REG_33C4_DP_ENCODER1_P0, BIT(5), BIT(6) | BIT(5)); + mtk_dp_mask(mtk_dp, REG_3F28_DP_ENC_4P_3, 0xA << 2, GENMASK(5, 2)); + mtk_dp_mask(mtk_dp, DP_TX_TOP_RESET_AND_PROBE, 0x9100FF, 0x9100FF); + + mtk_dp_mask(mtk_dp, MTK_DP_TOP_IRQ_MASK, ENCODER_IRQ_MSK | TRANS_IRQ_MSK, + ENCODER_IRQ_MSK | TRANS_IRQ_MSK); +} + +void dptx_hal_set_color_format(struct mtk_dp *mtk_dp, u8 out_format) +{ + u32 val; + + /* MISC0 */ + mtk_dp_mask(mtk_dp, REG_3034_DP_ENCODER0_P0, out_format << DP_TEST_COLOR_FORMAT_SHIFT, + DP_TEST_COLOR_FORMAT_MASK); + mtk_dp_mask(mtk_dp, REG_3034_DP_ENCODER0_P0, BIT(3), BIT(3)); + + switch (out_format) { + case DP_COLOR_FORMAT_RGB_444: + case DP_COLOR_FORMAT_YUV_444: + val = 0; + break; + case DP_COLOR_FORMAT_YUV_422: + val = 0x1; + break; + case DP_COLOR_FORMAT_YUV_420: + val = 0x2; + break; + default: + printk(BIOS_ERR, "Unsupported color format: %u\n", out_format); + return; + } + mtk_dp_mask(mtk_dp, REG_303C_DP_ENCODER0_P0, val << 12, 0x7 << 12); +} + +void dptx_hal_settu_setencoder(struct mtk_dp *mtk_dp) +{ + mtk_dp_mask(mtk_dp, REG_303C_DP_ENCODER0_P0, BIT(15), BIT(15)); + DP_WRITE2BYTE(mtk_dp, REG_3040_DP_ENCODER0_P0, 0x2020); + DP_WRITE2BYTE(mtk_dp, REG_3364_DP_ENCODER1_P0, 0x2020); + mtk_dp_mask(mtk_dp, REG_3300_DP_ENCODER1_P0, 0x2 << 8, 0x3 << 8); + mtk_dp_mask(mtk_dp, REG_3364_DP_ENCODER1_P0, 0x40 << 8, 0x70 << 8); +} + +bool dptx_hal_hpd_high(struct mtk_dp *mtk_dp) +{ + return mtk_dp_read(mtk_dp, REG_364C_AUX_TX_P0) & BIT(15); +} + +bool dptx_hal_setswing_preemphasis(struct mtk_dp *mtk_dp, int lane_num, u8 swing_value, + u8 preemphasis) +{ + assert(lane_num < DPTX_LANE_MAX); + + for (int i = 0; i < lane_num; ++i) { + mtk_dp_phy_mask(mtk_dp, driving_offset[i], + swing_value << 1 | preemphasis << 3, + EDP_TX_LN_VOLT_SWING_VAL_MASK | EDP_TX_LN_PRE_EMPH_VAL_MASK); + printk(BIOS_DEBUG, "lane(%d), set swing(%u), emp(%u)\n", + i, swing_value, preemphasis); + } + mtk_dp_mask(mtk_dp, 0x2000, GENMASK(1, 0), GENMASK(1, 0)); + return true; +} + +static void dptx_hal_phy_reset_swing_preemphasis(struct mtk_dp *mtk_dp) +{ + for (int i = 0; i < ARRAY_SIZE(driving_offset); i++) + mtk_dp_phy_mask(mtk_dp, driving_offset[i], 0, + EDP_TX_LN_VOLT_SWING_VAL_MASK | EDP_TX_LN_PRE_EMPH_VAL_MASK); +} + +void dptx_hal_hpd_detect_setting(struct mtk_dp *mtk_dp) +{ + mtk_dp_mask(mtk_dp, REG_364C_AUX_TX_P0, HPD_INT_THD_FLDMASK_VAL << 4, + HPD_INT_THD_FLDMASK); +} + +void dptx_hal_phy_init(struct mtk_dp *mtk_dp) +{ + mtk_dp_phy_mask(mtk_dp, IPMUX_CONTROL, 0 << EDPTX_DSI_PHYD_SEL_FLDMASK_POS, + EDPTX_DSI_PHYD_SEL_FLDMASK); + + mtk_dp_phy_mask(mtk_dp, PHYD_DIG_GLB_OFFSET + 0x10, GENMASK(2, 0), GENMASK(2, 0)); + dptx_hal_ssc_en(mtk_dp, false); +} + +void dptx_hal_set_txrate(struct mtk_dp *mtk_dp, u8 value) +{ + printk(BIOS_INFO, "Link rate = 0x%x\n", value); + switch (value) { + case DP_LINKRATE_RBR: + mtk_dp_phy_write(mtk_dp, 0x143C, 0x1); + break; + case DP_LINKRATE_HBR: + mtk_dp_phy_write(mtk_dp, 0x143C, 0x4); + break; + case DP_LINKRATE_HBR2: + mtk_dp_phy_write(mtk_dp, 0x143C, 0x7); + break; + case DP_LINKRATE_HBR3: + mtk_dp_phy_write(mtk_dp, 0x143C, 0x9); + break; + default: + printk(BIOS_ERR, "Link rate not support(%d)\n", value); + return; + } +} + +void dptx_hal_phy_set_lanes(struct mtk_dp *mtk_dp, u8 lane_count) +{ + for (int i = 0; i < lane_count; i++) + mtk_dp_phy_mask(mtk_dp, PHYD_DIG_GLB_OFFSET + 0x74, BIT(i), BIT(i)); +} + +void dptx_hal_phy_setting(struct mtk_dp *mtk_dp) +{ + u8 link_rate = mtk_dp->train_info.linkrate; + u8 lane_count = mtk_dp->train_info.linklane_count; + + dptx_hal_phy_set_lanes(mtk_dp, lane_count); + dptx_hal_set_txrate(mtk_dp, link_rate); + + /* Turn on phy power after phy configure */ + mtk_dp_mask(mtk_dp, REG_3FF8_DP_ENC_4P_3, PHY_STATE_W_1_DP_ENC_4P_3, + PHY_STATE_W_1_DP_ENC_4P_3_MASK); + mtk_dp_mask(mtk_dp, 0x2000, GENMASK(1, 0), GENMASK(1, 0)); + printk(BIOS_DEBUG, "[eDPTX] DP_PHY_DIG_PLL_CTL_1:%#x\n", + mtk_dp_phy_read(mtk_dp, DP_PHY_DIG_PLL_CTL_1)); +} + +void dptx_hal_ssc_en(struct mtk_dp *mtk_dp, bool enable) +{ + if (enable) { + printk(BIOS_DEBUG, "[eDPTX] enable ssc\n"); + mtk_dp_phy_mask(mtk_dp, DP_PHY_DIG_PLL_CTL_1, BIT(8), BIT(8)); + } else { + printk(BIOS_DEBUG, "[eDPTX] disable ssc\n"); + mtk_dp_phy_mask(mtk_dp, DP_PHY_DIG_PLL_CTL_1, 0x0, BIT(8)); + } + printk(BIOS_DEBUG, "[eDPTX] DP_PHY_DIG_PLL_CTL_1:%#x\n", + mtk_dp_phy_read(mtk_dp, DP_PHY_DIG_PLL_CTL_1)); + + mdelay(1); +} + +void dptx_hal_aux_setting(struct mtk_dp *mtk_dp) +{ + /* Modify timeout threshold = 1595 [12 : 8] */ + mtk_dp_mask(mtk_dp, REG_360C_AUX_TX_P0, 0x1D0C, 0x1FFF); + mtk_dp_mask(mtk_dp, REG_3658_AUX_TX_P0, 0, BIT(0)); + /* [0]mtk_dp, REG_aux_tx_ov_en */ + mtk_dp_mask(mtk_dp, REG_36A0_AUX_TX_4P, 0xFFFC, 0xFFFC); + + /* 26M */ + mtk_dp_mask(mtk_dp, REG_3634_AUX_TX_P0, AUX_TX_OVER_SAMPLE_RATE_FOR_26M << 8, + 0xff << 8); + mtk_dp_mask(mtk_dp, REG_3614_AUX_TX_P0, AUX_RX_UI_CNT_THR_AUX_FOR_26M, 0x7f); + + /* Modify, 13 for 26M */ + mtk_dp_mask(mtk_dp, REG_37C8_AUX_TX_P0, MTK_ATOP_EN_AUX_TX_4P, MTK_ATOP_EN_AUX_TX_4P); + /* Disable aux sync_stop detect function */ + mtk_dp_mask(mtk_dp, REG_3690_AUX_TX_P0, RX_REPLY_COMPLETE_MODE_AUX_TX_4P, + RX_REPLY_COMPLETE_MODE_AUX_TX_4P); + + mtk_dp_mask(mtk_dp, REG_367C_AUX_TX_P0, HPD_CONN_THD_AUX_TX_P0_FLDMASK_POS << 6, + HPD_CONN_THD_AUX_TX_P0_FLDMASK); + + mtk_dp_mask(mtk_dp, REG_37A0_AUX_TX_P0, HPD_DISC_THD_AUX_TX_P0_FLDMASK_POS << 4, + HPD_DISC_THD_AUX_TX_P0_FLDMASK); + mtk_dp_mask(mtk_dp, REG_3690_AUX_TX_P0, RX_REPLY_COMPLETE_MODE_AUX_TX_4P, + RX_REPLY_COMPLETE_MODE_AUX_TX_4P); + mtk_dp_mask(mtk_dp, REG_3FF8_DP_ENC_4P_3, XTAL_FREQ_FOR_PSR_DP_ENC_4P_3_VALUE << 9, + XTAL_FREQ_FOR_PSR_DP_ENC_4P_3_MASK); + mtk_dp_mask(mtk_dp, REG_366C_AUX_TX_P0, XTAL_FREQ_DP_TX_AUX_366C_VALUE << 8, + XTAL_FREQ_DP_TX_AUX_366C_MASK); +} + +void dptx_hal_digital_setting(struct mtk_dp *mtk_dp) +{ + mtk_dp_mask(mtk_dp, REG_304C_DP_ENCODER0_P0, 0, VBID_VIDEO_MUTE_DP_ENC0_4P_MASK); + mtk_dp_mask(mtk_dp, REG_3368_DP_ENCODER1_P0, BS2BS_MODE_DP_ENC1_4P_VAL << 12, + 0x3 << 12); + mtk_dp_mask(mtk_dp, REG_3030_DP_ENCODER0_P0, BIT(11), BIT(11)); + + /* dp I-mode enable */ + mtk_dp_mask(mtk_dp, BS2BS_MODE_DP_ENCODER1_P0_FLDMASK, DP_I_MODE_ENABLE, + DP_I_MODE_ENABLE); + mtk_dp_mask(mtk_dp, REG_3030_DP_ENCODER0_P0, 0x3ff, 0x3ff); + mtk_dp_mask(mtk_dp, REG_3028_DP_ENCODER0_P0, 0, BIT(15)); + mtk_dp_mask(mtk_dp, REG_302C_DP_ENCODER0_P0, 0, BIT(15)); + + /* set color format */ + dptx_hal_set_color_format(mtk_dp, DP_COLOR_FORMAT_RGB_444); + + /* set color depth */ + dptx_hal_set_color_depth(mtk_dp, DP_COLOR_DEPTH_8BIT); + + /* reg_bs)symbol_cnt_reset */ + mtk_dp_mask(mtk_dp, REG_3000_DP_ENCODER0_P0, REG_BS_SYMBOL_CNT_RESET, + REG_BS_SYMBOL_CNT_RESET); + mtk_dp_mask(mtk_dp, REG_3004_DP_ENCODER0_P0, BIT(14), BIT(14)); + printk(BIOS_DEBUG, "[eDPTX] REG_3004_DP_ENCODER0_P0:%#x\n", + mtk_dp_read(mtk_dp, REG_3004_DP_ENCODER0_P0)); + + mtk_dp_mask(mtk_dp, REG_3368_DP_ENCODER1_P0, 0x2, BIT(1) | BIT(2)); + mtk_dp_mask(mtk_dp, REG_3368_DP_ENCODER1_P0, BIT(15), BIT(15)); + mtk_dp_mask(mtk_dp, REG_304C_DP_ENCODER0_P0, 0, BIT(8)); + + /* [5:0]video sram start address */ + mtk_dp_mask(mtk_dp, REG_303C_DP_ENCODER0_P0, 0x8, 0x3F); + + /* reg_psr_patgen_avt_en patch */ + mtk_dp_mask(mtk_dp, REG_3F80_DP_ENC_4P_3, 0, PSR_PATGEN_AVT_EN_FLDMASK); + + /* phy D enable */ + mtk_dp_mask(mtk_dp, REG_3FF8_DP_ENC_4P_3, PHY_STATE_W_1_DP_ENC_4P_3, + PHY_STATE_W_1_DP_ENC_4P_3_MASK); + + /* reg_dvo_on_ow_en */ + mtk_dp_mask(mtk_dp, REG_3FF8_DP_ENC_4P_3, DVO_ON_W_1_FLDMASK, DVO_ON_W_1_FLDMASK); + + /* dp tx encoder reset all sw */ + mtk_dp_mask(mtk_dp, REG_3004_DP_ENCODER0_P0, DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0, + DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0); + printk(BIOS_DEBUG, "[eDPTX] REG_3004_DP_ENCODER0_P0:%#x\n", + mtk_dp_read(mtk_dp, REG_3004_DP_ENCODER0_P0)); + + mtk_dp_mask(mtk_dp, REG_3004_DP_ENCODER0_P0, 0, BIT(9)); + printk(BIOS_DEBUG, "[eDPTX] REG_3004_DP_ENCODER0_P0:%#x\n", + mtk_dp_read(mtk_dp, REG_3004_DP_ENCODER0_P0)); + + mtk_dp_mask(mtk_dp, REG_3FF8_DP_ENC_4P_3, 0xff, 0xff); + + /* Wait for sw reset to complete */ + mdelay(1); +} + +void dptx_hal_digital_swreset(struct mtk_dp *mtk_dp) +{ + printk(BIOS_DEBUG, "[eDPTX] DP_PHY_DIG_TX_CTL_0:%#x\n", + mtk_dp_phy_read(mtk_dp, DP_PHY_DIG_TX_CTL_0)); + mtk_dp_mask(mtk_dp, REG_340C_DP_TRANS_P0, BIT(13), BIT(13)); + mdelay(1); + mtk_dp_mask(mtk_dp, REG_340C_DP_TRANS_P0, 0, BIT(13)); + + mtk_dp_mask(mtk_dp, EDP_TX_TOP_CLKGEN_0, 0xF, 0xF); + printk(BIOS_DEBUG, "[eDPTX] DP_PHY_DIG_TX_CTL_0:%#x\n", + mtk_dp_phy_read(mtk_dp, DP_PHY_DIG_TX_CTL_0)); +} + +void dptx_hal_swing_emp_reset(struct mtk_dp *mtk_dp) +{ + mtk_dp_mask(mtk_dp, REG_2004_TOP_SWING_EMP, 0, + DP_TX0_VOLT_SWING_MASK | DP_TX1_VOLT_SWING_MASK | DP_TX2_VOLT_SWING_MASK | + DP_TX3_VOLT_SWING_MASK | DP_TX0_PRE_EMPH_MASK | DP_TX1_PRE_EMPH_MASK | + DP_TX2_PRE_EMPH_MASK | DP_TX3_PRE_EMPH_MASK); +} + +void dptx_hal_phyd_reset(struct mtk_dp *mtk_dp) +{ + u32 val; + + mtk_dp_phy_mask(mtk_dp, DP_PHY_DIG_SW_RST, 0, BIT(0)); + udelay(10); + mtk_dp_phy_mask(mtk_dp, DP_PHY_DIG_SW_RST, BIT(0), BIT(0)); + val = mtk_dp_phy_read(mtk_dp, DP_PHY_DIG_TX_CTL_0) & 0xF; + printk(BIOS_DEBUG, "[eDPTX] DP_PHY_DIG_TX_CTL_0:%#x\n", val); + + while (val > 0) { + val >>= 1; + mtk_dp_phy_mask(mtk_dp, DP_PHY_DIG_TX_CTL_0, val, 0xF); + printk(BIOS_DEBUG, "[eDPTX] DP_PHY_DIG_TX_CTL_0:%#x\n", val); + } + printk(BIOS_DEBUG, "[eDPTX] DP_PHY_DIG_TX_CTL_0:%#x\n", + mtk_dp_phy_read(mtk_dp, DP_PHY_DIG_TX_CTL_0)); + + dptx_hal_phy_reset_swing_preemphasis(mtk_dp); +} + +void dptx_hal_phy_wait_aux_ldo_ready(struct mtk_dp *mtk_dp) +{ + u32 mask = RGS_BG_CORE_EN_READY_MASK | RGS_AUX_LDO_EN_READY_MASK; + + if (!retry(WAIT_AUX_READY_RETRY_TIMES, (mtk_dp_phy_read(mtk_dp, 0x146C) & mask) == mask, + mdelay(2))) { + printk(BIOS_ERR, "Wait AUX LDO ready timeout!\n"); + } +} + +void dptx_hal_set_txlane(struct mtk_dp *mtk_dp, u8 value) +{ + /* Turn off phy power before phy configure */ + mtk_dp_mask(mtk_dp, REG_3F44_DP_ENC_4P_3, PHY_PWR_STATE_OW_EN_DP_ENC_4P_3, + PHY_PWR_STATE_OW_EN_DP_ENC_4P_3_MASK); + mtk_dp_mask(mtk_dp, REG_3F44_DP_ENC_4P_3, BIAS_POWER_ON, + PHY_PWR_STATE_OW_VALUE_DP_ENC_4P_3_MASK); + dptx_hal_phy_wait_aux_ldo_ready(mtk_dp); + mtk_dp_mask(mtk_dp, REG_3F44_DP_ENC_4P_3, 0 << 2, PHY_PWR_STATE_OW_EN_DP_ENC_4P_3_MASK); + + if (value == 0) + mtk_dp_mask(mtk_dp, REG_35F0_DP_TRANS_P0, 0, BIT(3) | BIT(2)); + else + mtk_dp_mask(mtk_dp, REG_35F0_DP_TRANS_P0, BIT(3), BIT(3) | BIT(2)); + + assert((value << 2) <= UINT8_MAX); + mtk_dp_mask(mtk_dp, REG_3000_DP_ENCODER0_P0, value, BIT(1) | BIT(0)); + mtk_dp_mask(mtk_dp, REG_34A4_DP_TRANS_P0, value << 2, BIT(3) | BIT(2)); +} + +void dptx_hal_phy_set_swing_preemphasis(struct mtk_dp *mtk_dp, u8 lane_count, u8 *swing_val, + u8 *preemphasis) +{ + assert(lane_count < DPTX_LANE_MAX); + + for (int i = 0; i < lane_count; ++i) { + mtk_dp_phy_mask(mtk_dp, driving_offset[i], + swing_val[i] << 1 | preemphasis[i] << 3, + EDP_TX_LN_VOLT_SWING_VAL_MASK | EDP_TX_LN_PRE_EMPH_VAL_MASK); + printk(BIOS_DEBUG, "lane(%d), set swing(%u), emp(%u)\n", + i, swing_val[i], preemphasis[i]); + } +} + +void dptx_hal_phy_set_idle_pattern(struct mtk_dp *mtk_dp, u8 lane_count, bool enable) +{ + u32 val = 0x0; + + printk(BIOS_INFO, "lane_count: %x idle pattern enable: %d\n", lane_count, enable); + switch (lane_count) { + case 1: + val = POST_MISC_DATA_LANE0_OV_DP_TRANS_4P_MASK; + break; + case 2: + val = POST_MISC_DATA_LANE0_OV_DP_TRANS_4P_MASK | + POST_MISC_DATA_LANE1_OV_DP_TRANS_4P_MASK; + break; + case 4: + val = POST_MISC_DATA_LANE0_OV_DP_TRANS_4P_MASK | + POST_MISC_DATA_LANE1_OV_DP_TRANS_4P_MASK | + POST_MISC_DATA_LANE2_OV_DP_TRANS_4P_MASK | + POST_MISC_DATA_LANE3_OV_DP_TRANS_4P_MASK; + break; + default: + printk(BIOS_ERR, "%s: Unexpected lane count %d\n", __func__, lane_count); + return; + } + mtk_dp_mask(mtk_dp, REG_3580_DP_TRANS_P0, (enable ? val : 0x0) << 8, + POST_MISC_DATA_LANE_OV_DP_TRANS_4P_MASK); +} diff --git a/src/soc/mediatek/mt8196/include/soc/addressmap.h b/src/soc/mediatek/mt8196/include/soc/addressmap.h index 6001a09..2582ee5 100644 --- a/src/soc/mediatek/mt8196/include/soc/addressmap.h +++ b/src/soc/mediatek/mt8196/include/soc/addressmap.h @@ -75,6 +75,7 @@ IOCFG_LT_BASE = IO_PHYS + 0x03000000, IOCFG_LM1_BASE = IO_PHYS + 0x03020000, IOCFG_LM2_BASE = IO_PHYS + 0x03040000, + EDP_PHY_BASE = IO_PHYS + 0x030A0000, MIPITX0_BASE = IO_PHYS + 0x030b0000, IOCFG_LB1_BASE = IO_PHYS + 0x030f0000, IOCFG_LB2_BASE = IO_PHYS + 0x03110000, @@ -197,6 +198,7 @@ OVLSYS_CONFIG_BASE = IO_PHYS + 0x22800000, OVLSYS1_CONFIG_BASE = IO_PHYS + 0x22C00000, DISP_VDISP_AO_CONFIG_BASE = IO_PHYS + 0x2E800000, + EDP_CLK_BASE = IO_PHYS + 0x21B50000, EDP_BASE = IO_PHYS + 0x2EC40000, MFG_TOP_CFG_BASE = MFGSYS_BASE + 0x08500000, MFG_GPUEB_BASE = MFGSYS_BASE + 0x0B000000, diff --git a/src/soc/mediatek/mt8196/include/soc/dp_intf.h b/src/soc/mediatek/mt8196/include/soc/dp_intf.h new file mode 100644 index 0000000..989cb90 --- /dev/null +++ b/src/soc/mediatek/mt8196/include/soc/dp_intf.h @@ -0,0 +1,210 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#ifndef __SOC_MEDIATEK_MT8196_DP_DP_INTF_H__ +#define __SOC_MEDIATEK_MT8196_DP_DP_INTF_H__ + +#include <edid.h> +#include <soc/addressmap.h> +#include <types.h> + +#define DVO_EN 0x00 +#define EN BIT(0) +#define DVO_FORCE_ON BIT(4) +#define LINK_OFF BIT(8) + +#define MMSYS1_CG_CLR0 0x108 +#define MMSYS1_CG_CLR1 0x118 +#define CKSYS2_CLK_CFG_3_CLR 0x48 +#define CKSYS2_CLK_CFG_UPDATE 0x4 +#define DISP_EDPTX_PWR_CON 0x74 + +#define DVO_RET 0x04 +#define SWRST BIT(0) +#define SWRST_SEL BIT(4) + +#define DVO_INTEN 0x08 +#define INT_VFP_START_EN BIT(0) +#define INT_VSYNC_START_EN BIT(1) +#define INT_VSYNC_END_EN BIT(2) +#define INT_VDE_START_EN BIT(3) +#define INT_VDE_END_EN BIT(4) +#define INT_WR_INFOQ_REG_EN BIT(5) +#define INT_TARGET_LINE0_EN BIT(6) +#define INT_TARGET_LINE1_EN BIT(7) +#define INT_TARGET_LINE2_EN BIT(8) +#define INT_TARGET_LINE3_EN BIT(9) +#define INT_WR_INFOQ_START_EN BIT(10) +#define INT_WR_INFOQ_END_EN BIT(11) +#define EXT_VSYNC_START_EN BIT(12) +#define EXT_VSYNC_END_EN BIT(13) +#define EXT_VDE_START_EN BIT(14) +#define EXT_VDE_END_EN BIT(15) +#define EXT_VBLANK_END_EN BIT(16) +#define UNDERFLOW_EN BIT(17) +#define INFOQ_ABORT_EN BIT(18) + +#define DVO_INTSTA 0x0C +#define INT_VFP_START_STA BIT(0) +#define INT_VSYNC_START_STA BIT(1) +#define INT_VSYNC_END_STA BIT(2) +#define INT_VDE_START_STA BIT(3) +#define INT_VDE_END_STA BIT(4) +#define INT_WR_INFOQ_REG_STA BIT(5) +#define INT_TARGET_LINE0_STA BIT(6) +#define INT_TARGET_LINE1_STA BIT(7) +#define INT_TARGET_LINE2_STA BIT(8) +#define INT_TARGET_LINE3_STA BIT(9) +#define INT_WR_INFOQ_START_STA BIT(10) +#define INT_WR_INFOQ_END_STA BIT(11) +#define EXT_VSYNC_START_STA BIT(12) +#define EXT_VSYNC_END_STA BIT(13) +#define EXT_VDE_START_STA BIT(14) +#define EXT_VDE_END_STA BIT(15) +#define EXT_VBLANK_END_STA BIT(16) +#define INT_UNDERFLOW_STA BIT(17) +#define INFOQ_ABORT_STA BIT(18) + +#define DVO_CON 0x10 +#define INTL_EN BIT(0) + +#define DVO_OUTPUT_SET 0x18 +#define OUT_NP_SEL (0x3 << 0) + +#define BIT_SWAP BIT(4) +#define CH_SWAP_MASK (0x7 << 5) +#define SWAP_RGB 0x00 +#define SWAP_GBR 0x01 +#define SWAP_BRG 0x02 +#define SWAP_RBG 0x03 +#define SWAP_GRB 0x04 +#define SWAP_BGR 0x05 +#define PXL_SWAP BIT(8) +#define R_MASK BIT(12) +#define G_MASK BIT(13) +#define B_MASK BIT(14) +#define DE_MASK BIT(16) +#define HS_MASK BIT(17) +#define VS_MASK BIT(18) +#define HS_INV BIT(19) +#define VS_INV BIT(20) + +#define DVO_SRC_SIZE 0x20 +#define SRC_HSIZE_SHIFT 0 +#define SRC_HSIZE_MASK (0xFFFF << 0) +#define SRC_VSIZE_SHIFT 16 +#define SRC_VSIZE_MASK (0xFFFF << 16) + +#define DVO_PIC_SIZE 0x24 +#define PIC_HSIZE_SHIFT 0 +#define PIC_HSIZE_MASK (0xFFFF << 0) +#define PIC_VSIZE_SHIFT 16 +#define PIC_VSIZE_MASK (0xFFFF << 16) + +#define DVO_TGEN_H0 0x50 +#define HFP_SHIFT 0 +#define HFP_MASK (0xFFFF << 0) +#define HSYNC_SHIFT 16 +#define HSYNC_MASK (0xFFFF << 16) + +#define DVO_TGEN_H1 0x54 +#define HSYNC2ACT_SHIFT 0 +#define HSYNC2ACT_MASK (0xFFFF << 0) +#define HACT_SHIFT 16 +#define HACT_MASK (0xFFFF << 16) + +#define DVO_TGEN_V0 0x58 +#define VFP_SHIFT 0 +#define VFP_MASK (0xFFFF << 0) +#define VSYNC_SHIFT 16 +#define VSYNC_MASK (0xFFFF << 16) + +#define DVO_TGEN_V1 0x5C +#define VSYNC2ACT_SHIFT 0 +#define VSYNC2ACT_MASK (0xFFFF << 0) +#define VACT_SHIFT 16 +#define VACT_MASK (0xFFFF << 16) + +#define DVO_TGEN_INFOQ_LATENCY 0x80 +#define INFOQ_START_LATENCY 0 +#define INFOQ_START_LATENCY_MASK (0xFFFF << 0) +#define INFOQ_END_LATENCY 16 +#define INFOQ_END_LATENCY_MASK (0xFFFF << 16) + +#define DVO_BUF_CON0 0x220 +#define DISP_BUF_EN BIT(0) +#define FIFO_UNDERFLOW_DONE_BLOCK BIT(4) + +#define DVO_TGEN_V_LAST_TRAILING_BLANK 0x6C +#define V_LAST_TRAILING_BLANK 0 +#define V_LAST_TRAILING_BLANK_MASK (0xFFFF << 0) + +#define DVO_TGEN_OUTPUT_DELAY_LINE 0x7C +#define EXT_TG_DLY_LINE 0 +#define EXT_TG_DLY_LINE_MASK (0xFFFF << 0) + +#define DVO_PATTERN_CTRL 0x100 +#define PRE_PAT_EN BIT(0) +#define PRE_PAT_SEL_MASK (0x7 << 4) +#define COLOR_BAR (0x4 << 4) +#define PRE_PAT_FORCE_ON BIT(8) + +#define DVO_PATTERN_COLOR 0x104 +#define PAT_R (0x3FF << 0) +#define PAT_G (0x3FF << 10) +#define PAT_B (0x3FF << 20) + +#define DVO_SHADOW_CTRL 0x190 +#define FORCE_COMMIT BIT(0) +#define BYPASS_SHADOW BIT(1) +#define READ_WRK_REG BIT(2) + +#define DVO_SIZE 0x18 +#define DVO_TGEN_VWIDTH 0x28 +#define DVO_TGEN_VPORCH 0x2C +#define DVO_TGEN_HPORCH 0x24 +#define DVO_TGEN_HWIDTH 0x20 + +#define DVO_BUF_SODI_HIGHT 0x230 +#define DVO_BUF_SODI_LOW 0x234 + +enum mtk_dvo_golden_setting_level { + MTK_DVO_FHD_60FPS_1920 = 0, + MTK_DVO_FHD_60FPS_2180, + MTK_DVO_FHD_60FPS_2400, + MTK_DVO_FHD_60FPS_2520, + MTK_DVO_FHD_90FPS, + MTK_DVO_FHD_120FPS, + MTK_DVO_WQHD_60FPS, + MTK_DVO_WQHD_120FPS, + MTK_DVO_8K_30FPS, + MTK_DVO_GSL_MAX, +}; + +struct mtk_dvo_gs_info { + u32 dvo_buf_sodi_high; + u32 dvo_buf_sodi_low; +}; + +enum TVDPLL_CLK { + TVDPLL_PLL = 0, + TVDPLL_D16 = 1, + TVDPLL_D8 = 2, + TVDPLL_D4 = 3, +}; + +struct mtk_dvo { + void *regs; + void *regs_ck; + void *regs_mm; + enum mtk_dvo_golden_setting_level gs_level; +}; + +struct mtk_dvo_sync_param { + u32 sync_width; + u32 front_porch; + u32 back_porch; +}; + +void dp_intf_config(const struct edid *edid); + +#endif /* __SOC_MEDIATEK_MT8196_DP_DP_INTF_H__ */ diff --git a/src/soc/mediatek/mt8196/include/soc/dptx.h b/src/soc/mediatek/mt8196/include/soc/dptx.h new file mode 100644 index 0000000..c22072a --- /dev/null +++ b/src/soc/mediatek/mt8196/include/soc/dptx.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#ifndef __SOC_MEDIATEK_MT8196_INCLUDE_SOC_DPTX_H__ +#define __SOC_MEDIATEK_MT8196_INCLUDE_SOC_DPTX_H__ + +#include <soc/dptx_common.h> + +#endif /* __SOC_MEDIATEK_MT8196_INCLUDE_SOC_DPTX_H__ */ diff --git a/src/soc/mediatek/mt8196/include/soc/dptx_hal.h b/src/soc/mediatek/mt8196/include/soc/dptx_hal.h new file mode 100644 index 0000000..57ce17e --- /dev/null +++ b/src/soc/mediatek/mt8196/include/soc/dptx_hal.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#ifndef __SOC_MEDIATEK_MT8196_DP_DPTX_HAL_H__ +#define __SOC_MEDIATEK_MT8196_DP_DPTX_HAL_H__ + +#include <soc/dptx_hal_common.h> + +#define MTK_DP_TRAIN_VOLTAGE_LEVEL_RETRY 5 +#define MTK_DP_TRAIN_DOWNSCALE_RETRY 10 + +enum { + DPTX_PATTERN_TPS1 = 1, + DPTX_PATTERN_TPS2, + DPTX_PATTERN_TPS3, + DPTX_PATTERN_TPS4, + DPTX_PATTERN_UNKNOWN, +}; + +void dptx_hal_swing_emp_reset(struct mtk_dp *mtk_dp); +void dptx_hal_phy_init(struct mtk_dp *mtk_dp); +void dptx_hal_phy_set_lanes(struct mtk_dp *mtk_dp, u8 lane_count); +void dptx_hal_phy_wait_aux_ldo_ready(struct mtk_dp *mtk_dp); +void dptx_hal_phy_set_idle_pattern(struct mtk_dp *mtk_dp, u8 lane_count, bool enable); +void dptx_hal_phy_set_swing_preemphasis(struct mtk_dp *mtk_dp, u8 lane_count, u8 *swing_val, + u8 *preemphasis); + +#endif /* __SOC_MEDIATEK_MT8196_DP_DPTX_HAL_H__ */ diff --git a/src/soc/mediatek/mt8196/include/soc/dptx_reg.h b/src/soc/mediatek/mt8196/include/soc/dptx_reg.h new file mode 100644 index 0000000..994e7cd --- /dev/null +++ b/src/soc/mediatek/mt8196/include/soc/dptx_reg.h @@ -0,0 +1,213 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#ifndef __SOC_MEDIATEK_MT8196_DP_DPTX_REG_H__ +#define __SOC_MEDIATEK_MT8196_DP_DPTX_REG_H__ + +#include <soc/dptx_reg_common.h> + +#define WAIT_AUX_READY_RETRY_TIMES 5 +#define PHYD_DIG_GLB_OFFSET 0x1400 +#define SEC_OFFSET 0x4000 +#define IPMUX_CONTROL (PHYD_DIG_GLB_OFFSET + 0x98) +#define EDPTX_DSI_PHYD_SEL_FLDMASK 0x1 +#define EDPTX_DSI_PHYD_SEL_FLDMASK_POS 0 +#define TOP_OFFSET 0x2000 +#define MTK_DP_TOP_IRQ_MASK 0x202C +#define ENCODER_IRQ_MSK BIT(0) +#define TRANS_IRQ_MSK BIT(1) +#define EDP_TX_TOP_CLKGEN_0 0x2074 +#define DP_PHY_DIG_PLL_CTL_1 0x1414 +#define DP_PHY_DIG_SW_RST 0x1438 +#define DP_PHY_DIG_TX_CTL_0 0x1474 +#define RGS_BG_CORE_EN_READY_MASK BIT(0) +#define RGS_AUX_LDO_EN_READY_MASK BIT(1) +#define REG_2004_TOP_SWING_EMP 0x2004 +#define DP_TX0_VOLT_SWING_MASK GENMASK(1, 0) +#define DP_TX0_PRE_EMPH_MASK GENMASK(3, 2) +#define DP_TX1_VOLT_SWING_MASK GENMASK(9, 8) +#define DP_TX1_PRE_EMPH_MASK GENMASK(11, 10) +#define DP_TX2_VOLT_SWING_MASK GENMASK(17, 16) +#define DP_TX2_PRE_EMPH_MASK GENMASK(19, 18) +#define DP_TX3_VOLT_SWING_MASK GENMASK(25, 24) +#define DP_TX3_PRE_EMPH_MASK GENMASK(27, 26) +#define REG_3000_DP_ENCODER0_P0 0x3000 +#define REG_BS_SYMBOL_CNT_RESET BIT(7) +#define REG_3004_DP_ENCODER0_P0 0x3004 +#define DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0 BIT(9) +#define REG_3008_DP_ENCODER0_P0 0x3008 +#define REG_300C_DP_ENCODER0_P0 0x300C +#define REG_3010_DP_ENCODER0_P0 0x3010 +#define REG_3014_DP_ENCODER0_P0 0x3014 +#define REG_3018_DP_ENCODER0_P0 0x3018 +#define REG_301C_DP_ENCODER0_P0 0x301C +#define REG_3020_DP_ENCODER0_P0 0x3020 +#define REG_3024_DP_ENCODER0_P0 0x3024 +#define REG_3028_DP_ENCODER0_P0 0x3028 +#define HSP_SW_DP_ENCODER0_P0_FLDMASK 0x8000 +#define HSP_SW_DP_ENCODER0_P0_FLDMASK_POS 15 +#define REG_302C_DP_ENCODER0_P0 0x302C +#define REG_3030_DP_ENCODER0_P0 0x3030 +#define REG_3034_DP_ENCODER0_P0 0x3034 +#define DP_TEST_COLOR_FORMAT_MASK (3 << 1) +#define DP_TEST_COLOR_FORMAT_SHIFT 1 +#define REG_303C_DP_ENCODER0_P0 0x303C +#define REG_3040_DP_ENCODER0_P0 0x3040 +#define REG_3044_DP_ENCODER0_P0 0x3044 +#define REG_3048_DP_ENCODER0_P0 0x3048 +#define REG_304C_DP_ENCODER0_P0 0x304C +#define VBID_VIDEO_MUTE_DP_ENC0_4P_MASK BIT(2) +#define REG_3050_DP_ENCODER0_P0 0x3050 +#define REG_3054_DP_ENCODER0_P0 0x3054 +#define REG_3064_DP_ENCODER0_P0 0x3064 +#define REG_3154_DP_ENCODER0_P0 0x3154 +#define REG_3158_DP_ENCODER0_P0 0x3158 +#define REG_315C_DP_ENCODER0_P0 0x315C +#define REG_3160_DP_ENCODER0_P0 0x3160 +#define REG_3164_DP_ENCODER0_P0 0x3164 +#define REG_3168_DP_ENCODER0_P0 0x3168 +#define REG_316C_DP_ENCODER0_P0 0x316C +#define REG_3170_DP_ENCODER0_P0 0x3170 +#define REG_3174_DP_ENCODER0_P0 0x3174 +#define REG_3178_DP_ENCODER0_P0 0x3178 +#define REG_31EC_DP_ENCODER0_P0 0x31EC +#define REG_3300_DP_ENCODER1_P0 0x3300 +#define REG_3364_DP_ENCODER1_P0 0x3364 +#define REG_3368_DP_ENCODER1_P0 0x3368 +#define BS2BS_MODE_DP_ENC1_4P_VAL 1 +#define BS2BS_MODE_DP_ENCODER1_P0_FLDMASK 0x3000 +#define DP_I_MODE_ENABLE BIT(6) +#define REG_33C0_DP_ENCODER1_P0 0x33C0 +#define REG_33C4_DP_ENCODER1_P0 0x33C4 +#define REG_33C8_DP_ENCODER1_P0 0x33C8 +#define REG_3400_DP_TRANS_P0 0x3400 +#define PATTERN1_EN_DP_TRANS_4P_TPS1 BIT(12) +#define PATTERN2_EN_DP_TRANS_4P_TPS2 BIT(13) +#define PATTERN3_EN_DP_TRANS_4P_TPS3 BIT(14) +#define PATTERN4_EN_DP_TRANS_4P_TPS4 BIT(15) +#define PATTERN_EN_DP_TRANS_4P_MASK GENMASK(15, 12) +#define REG_3404_DP_TRANS_P0 0x3404 +#define REG_340C_DP_TRANS_P0 0x340C +#define REG_3418_DP_TRANS_P0 0x3418 +#define REG_342C_DP_TRANS_P0 0x342C +#define REG_34A4_DP_TRANS_P0 0x34A4 +#define REG_3540_DP_TRANS_P0 0x3540 +#define REG_3580_DP_TRANS_P0 0x3580 +#define POST_MISC_DATA_LANE0_OV_DP_TRANS_4P_MASK BIT(8) +#define POST_MISC_DATA_LANE1_OV_DP_TRANS_4P_MASK BIT(9) +#define POST_MISC_DATA_LANE2_OV_DP_TRANS_4P_MASK BIT(10) +#define POST_MISC_DATA_LANE3_OV_DP_TRANS_4P_MASK BIT(11) +#define POST_MISC_DATA_LANE_OV_DP_TRANS_4P_MASK GENMASK(11, 8) +#define REG_35F0_DP_TRANS_P0 0x35F0 +#define REG_360C_AUX_TX_P0 0x360C +#define REG_3614_AUX_TX_P0 0x3614 +#define AUX_RX_UI_CNT_THR_AUX_FOR_26M 13 +#define REG_3618_AUX_TX_P0 0x3618 +#define AUX_RX_FIFO_FULL_AUX_TX_P0_FLDMASK 0x200 +#define REG_3620_AUX_TX_P0 0x3620 +#define AUX_RD_MODE_AUX_TX_P0_FLDMASK 0x200 +#define AUX_RD_MODE_AUX_TX_P0_FLDMASK_POS 9 +#define AUX_RX_FIFO_READ_PULSE_TX_P0_FLDMASK 0x100 +#define AUX_RX_FIFO_R_PULSE_TX_P0_FLDMASK_POS 8 +#define REG_3624_AUX_TX_P0 0x3624 +#define REG_3628_AUX_TX_P0 0x3628 +#define REG_362C_AUX_TX_P0 0x362C +#define AUX_NO_LENGTH_AUX_TX_P0_FLDMASK 0x1 +#define AUX_NO_LENGTH_AUX_TX_P0_FLDMASK_POS 0 +#define REG_3630_AUX_TX_P0 0x3630 +#define AUX_TX_REQUEST_READY_AUX_TX_P0_FLDMASK 0x8 +#define AUX_TX_REQUEST_READY_AUX_TX_P0_FLDMASK_POS 3 +#define REG_3634_AUX_TX_P0 0x3634 +#define AUX_TX_OVER_SAMPLE_RATE_FOR_26M 25 +#define REG_3640_AUX_TX_P0 0x3640 +#define AUX_RX_RECV_COMPLETE_IRQ_TX_P0_FLDMASK 0x40 +#define AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_FLDMASK 0x1 +#define REG_3644_AUX_TX_P0 0x3644 +#define REG_3648_AUX_TX_P0 0x3648 +#define REG_364C_AUX_TX_P0 0x364C +#define HPD_INT_THD_FLDMASK_VAL 0x32 +#define HPD_INT_THD_FLDMASK 0x3F0 +#define REG_3650_AUX_TX_P0 0x3650 +#define MCU_REQUEST_DATA_NUM_AUX_TX_P0_FLDMASK 0xf000 +#define MCU_REQ_DATA_NUM_AUX_TX_P0_FLDMASK_POS 12 +#define MCU_ACK_TRANSACTION_COMPLETE_AUX_TX_P0_FLDMASK 0x100 +#define MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_FLDMASK_POS 8 +#define REG_3658_AUX_TX_P0 0x3658 +#define REG_366C_AUX_TX_P0 0x366C +#define XTAL_FREQ_DP_TX_AUX_366C_VALUE 0x68 +#define XTAL_FREQ_DP_TX_AUX_366C_MASK 0xFF00 +#define REG_367C_AUX_TX_P0 0x367C +#define HPD_CONN_THD_AUX_TX_P0_FLDMASK_POS 5 +#define HPD_CONN_THD_AUX_TX_P0_FLDMASK 0x3c0 +#define REG_3690_AUX_TX_P0 0x3690 +#define RX_REPLY_COMPLETE_MODE_AUX_TX_4P BIT(8) +#define REG_36A0_AUX_TX_4P 0x36A0 +#define REG_3704_AUX_TX_P0 0x3704 +#define AUX_TX_FIFO_WRITE_DATA_TOGGLE_AUX_TX_P0_FLDMASK 0x2 +#define AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_FLDMASK 0x4 +#define AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_FLDMASK_POS 2 +#define REG_3708_AUX_TX_P0 0x3708 +#define REG_37A0_AUX_TX_P0 0x37A0 +#define HPD_DISC_THD_AUX_TX_P0_FLDMASK_POS 5 +#define HPD_DISC_THD_AUX_TX_P0_FLDMASK 0xF0 +#define REG_37C8_AUX_TX_P0 0x37C8 +#define MTK_ATOP_EN_AUX_TX_4P BIT(0) +#define REG_3F04_DP_ENC_4P_3 0x3F04 +#define REG_3F08_DP_ENC_4P_3 0x3F08 +#define REG_3F0C_DP_ENC_4P_3 0x3F0C +#define REG_3F10_DP_ENC_4P_3 0x3F10 +#define REG_3F28_DP_ENC_4P_3 0x3F28 +#define REG_3F44_DP_ENC_4P_3 0x3F44 +#define PHY_PWR_STATE_OW_EN_DP_ENC_4P_3 BIT(2) +#define PHY_PWR_STATE_OW_EN_DP_ENC_4P_3_MASK BIT(2) +#define BIAS_POWER_ON (0x01 << 3) +#define PHY_PWR_STATE_OW_VALUE_DP_ENC_4P_3_MASK GENMASK(4, 3) +#define REG_3F80_DP_ENC_4P_3 0x3F80 +#define PSR_PATGEN_AVT_EN_FLDMASK 0x20 +#define REG_3FF8_DP_ENC_4P_3 0x3FF8 +#define PHY_STATE_W_1_DP_ENC_4P_3 BIT(6) +#define PHY_STATE_W_1_DP_ENC_4P_3_MASK BIT(6) +#define DVO_ON_W_1_FLDMASK 0x20 +#define XTAL_FREQ_FOR_PSR_DP_ENC_4P_3_VALUE 25 +#define XTAL_FREQ_FOR_PSR_DP_ENC_4P_3_MASK 0x3E00 +#define PHYD_DIG_LAN0_OFFSET 0x1000 +#define PHYD_DIG_LAN1_OFFSET 0x1100 +#define PHYD_DIG_LAN2_OFFSET 0x1200 +#define PHYD_DIG_LAN3_OFFSET 0x1300 +#define DRIVING_FORCE 0x30 +#define EDP_TX_LN_VOLT_SWING_VAL_MASK GENMASK(2, 1) +#define EDP_TX_LN_PRE_EMPH_VAL_MASK GENMASK(4, 3) +#define DP_TX_TOP_APB_WSTRB (TOP_OFFSET + 0x10) +#define DP_TX_TOP_RESET_AND_PROBE (TOP_OFFSET + 0x20) +#define DP_TX_SECURE_REG11 (SEC_OFFSET + 0x2C) +#define DP_LANE_COUNT_ENHANCED_FRAME_EN (1 << 7) +#define DPCD_00000 0x00000 +#define DPCD_0000E 0x0000E +#define DPCD_00021 0x00021 +#define DPCD_00100 0x00100 +#define DPCD_00101 0x00101 +#define DPCD_00102 0x00102 +#define DP_TRAINING_PATTERN_DISABLE 0 +#define DP_TRAINING_PATTERN_1 1 +#define DP_TRAINING_PATTERN_2 2 +#define DP_TRAINING_PATTERN_3 3 /* 1.2 */ +#define DP_TRAINING_PATTERN_4 7 /* 1.4 */ +#define DP_LINK_SCRAMBLING_DISABLE BIT(5) +#define DPCD_00103 0x00103 +#define DP_TRAIN_VOLTAGE_SWING_SHIFT 0 +#define DP_TRAIN_MAX_SWING_REACHED BIT(2) +#define DP_TRAIN_PRE_EMPHASIS_SHIFT 3 +#define DP_TRAIN_MAX_PRE_EMPHASIS_REACHED BIT(5) +#define DPCD_00107 0x00107 +#define DP_SPREAD_AMP_0_5 BIT(4) +#define DPCD_00200 0x00200 +#define DPCD_00202 0x00202 +#define DPCD_00206 0x00206 +#define DP_ADJUST_VOLTAGE_SWING_LANE0_MASK 0x03 +#define DP_ADJUST_PRE_EMPHASIS_LANE0_MASK 0x0C +#define DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT 2 +#define DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT 4 +#define DPCD_00600 0x00600 +#define DPCD_02002 0x02002 +#define DPCD_02003 0x02003 + +#endif /* __SOC_MEDIATEK_MT8196_DP_DPTX_REG_H__ */ -- To view, visit https://review.coreboot.org/c/coreboot/+/85949?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Iccba53f6c6181ca84624c216f9641a2ae9041671 Gerrit-Change-Number: 85949 Gerrit-PatchSet: 10 Gerrit-Owner: Jarried Lin <jarried.lin(a)mediatek.com> Gerrit-Reviewer: Bincai Liu <bincai.liu(a)mediatek.corp-partner.google.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Jitao Shi <jitao.shi(a)mediatek.corp-partner.google.com>

1 0

[S] Change in coreboot[main]: soc/mediatek/mt8196: Add DVFS driver
by Yidi Lin (Code Review) 21 Jan '25

21 Jan '25

Yidi Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86041?usp=email ) Change subject: soc/mediatek/mt8196: Add DVFS driver ...................................................................... soc/mediatek/mt8196: Add DVFS driver Add the initialization code for CPU Dynamic Voltage and Frequency Scaling (DVFS) for MCUPM. TEST=Build pass. BUG=b:317009620 Change-Id: I92b7c57ad8c3d9e9954f02a08954939f45c5e2c2 Signed-off-by: Jarried Lin <jarried.lin(a)mediatek.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/86041 Reviewed-by: Yidi Lin <yidilin(a)google.com> Reviewed-by: Yu-Ping Wu <yupingso(a)google.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/soc/mediatek/mt8196/Makefile.mk A src/soc/mediatek/mt8196/dvfs.c M src/soc/mediatek/mt8196/include/soc/addressmap.h A src/soc/mediatek/mt8196/include/soc/dvfs.h 4 files changed, 33 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Yidi Lin: Looks good to me, approved Yu-Ping Wu: Looks good to me, approved diff --git a/src/soc/mediatek/mt8196/Makefile.mk b/src/soc/mediatek/mt8196/Makefile.mk index bd17794..d8639c8 100644 --- a/src/soc/mediatek/mt8196/Makefile.mk +++ b/src/soc/mediatek/mt8196/Makefile.mk @@ -28,6 +28,7 @@ romstage-y += clkbuf_ctl.c romstage-y += ../common/dram_init.c romstage-y += ../common/dramc_param.c +romstage-y += dvfs.c romstage-$(CONFIG_PCI) += ../common/early_init.c ../common/pcie.c romstage-y += ../common/emi.c romstage-y += irq2axi.c diff --git a/src/soc/mediatek/mt8196/dvfs.c b/src/soc/mediatek/mt8196/dvfs.c new file mode 100644 index 0000000..da0fdaa --- /dev/null +++ b/src/soc/mediatek/mt8196/dvfs.c @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#include <arch/cache.h> +#include <device/mmio.h> +#include <soc/dvfs.h> + +void dvfs_init(void) +{ + uint32_t val; + + val = BIT(8) | BIT(0); + + write32p(CSRAM_BASE + 0x8, 0x55AA55AA); + write32p(CSRAM_BASE + 0xC, val); + + dcache_clean_invalidate_by_mva((void *)CSRAM_BASE, CACHE_LINE); +} diff --git a/src/soc/mediatek/mt8196/include/soc/addressmap.h b/src/soc/mediatek/mt8196/include/soc/addressmap.h index f065c7b..6001a09 100644 --- a/src/soc/mediatek/mt8196/include/soc/addressmap.h +++ b/src/soc/mediatek/mt8196/include/soc/addressmap.h @@ -4,6 +4,7 @@ #define __SOC_MEDIATEK_MT8196_INCLUDE_SOC_ADDRESSMAP_H__ enum { + SRAM_BASE = 0x00100000, MCUSYS_BASE = 0x0C000000, MCUPM_CFG_BASE = 0x0C240000, MCUPM_SRAM_BASE = 0x0C250000, diff --git a/src/soc/mediatek/mt8196/include/soc/dvfs.h b/src/soc/mediatek/mt8196/include/soc/dvfs.h new file mode 100644 index 0000000..76634bf --- /dev/null +++ b/src/soc/mediatek/mt8196/include/soc/dvfs.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MIT */ + +#ifndef __SOC_MEDIATEK_MT8196_DVFS_H__ +#define __SOC_MEDIATEK_MT8196_DVFS_H__ + +#include <soc/addressmap.h> + +#define CACHE_LINE 64 +#define CSRAM_OFFSET 0x0001BC00 +#define CSRAM_BASE (SRAM_BASE + CSRAM_OFFSET) + +void dvfs_init(void); + +#endif -- To view, visit https://review.coreboot.org/c/coreboot/+/86041?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I92b7c57ad8c3d9e9954f02a08954939f45c5e2c2 Gerrit-Change-Number: 86041 Gerrit-PatchSet: 5 Gerrit-Owner: Jarried Lin <jarried.lin(a)mediatek.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[M] Change in coreboot[main]: mb/amd/birman_plus: Kconfig
by Ana Carolina Cabral (Code Review) 21 Jan '25

21 Jan '25

Attention is currently required from: Ana Carolina Cabral. Hello Felix Held, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85493?usp=email to look at the new patch set (#14). The following approvals got outdated and were removed: Verified-1 by build bot (Jenkins) Change subject: mb/amd/birman_plus: Kconfig ...................................................................... mb/amd/birman_plus: Kconfig Rectify board configuration flags based on the schematics Doc. 105-D99700-00C and User Guide #58168 (NDA). Change-Id: Ia310ea616006479b9a052afb99d08df6a11431f4 Signed-off-by: Ana Carolina Cabral <ana.cabral(a)amd.com> --- M src/mainboard/amd/birman_plus/Kconfig M src/mainboard/amd/birman_plus/ec.c M src/mainboard/amd/birman_plus/port_descriptors_glinda.c 3 files changed, 71 insertions(+), 90 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/85493/14 -- To view, visit https://review.coreboot.org/c/coreboot/+/85493?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia310ea616006479b9a052afb99d08df6a11431f4 Gerrit-Change-Number: 85493 Gerrit-PatchSet: 14 Gerrit-Owner: Ana Carolina Cabral Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-CC: Nick Kochlowski <nickkochlowski(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Ana Carolina Cabral

1 0

[S] Change in coreboot[main]: mb/brya/var/uldrenite: Remove location setting in HDA verb tables
by John Su (Code Review) 21 Jan '25

21 Jan '25

Attention is currently required from: Dinesh Gehlot, Dtrain Hsu, Eric Lai, Jayvik Desai, Kapil Porwal, Nick Vaccaro, Paul Menzel, Subrata Banik. John Su has posted comments on this change by John Su. ( https://review.coreboot.org/c/coreboot/+/86079?usp=email ) Change subject: mb/brya/var/uldrenite: Remove location setting in HDA verb tables ...................................................................... Patch Set 2: (3 comments) Commit Message: https://review.coreboot.org/c/coreboot/+/86079/comment/d7dc8f29_59c05e6f?us… : PS1, Line 7: Update HDA verb tables > Remove location setting in HDA verb tables Done File src/mainboard/google/brya/variants/uldrenite/hda_verb.c: https://review.coreboot.org/c/coreboot/+/86079/comment/a92fe9e8_88a40a15?us… : PS1, Line 7: 0x10ec0236, // Codec Vendor ID: Realtek ALC3204 > Unrelated. Should be a separate patch with a tab instead of spaces. Done https://review.coreboot.org/c/coreboot/+/86079/comment/e74bc776_b65e8396?us… : PS1, Line 32: AZALIA_PIN_CFG(0, 0x21, 0x00211020), > Gerrit highlights the line. […] 0x02211020 => 0x00211020 -- To view, visit https://review.coreboot.org/c/coreboot/+/86079?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I05767ac80c2e3d609f944d0f669fcb343c1991ef Gerrit-Change-Number: 86079 Gerrit-PatchSet: 2 Gerrit-Owner: John Su <john_su(a)compal.corp-partner.google.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Frank Wu <frank_wu(a)compal.corp-partner.google.com> Gerrit-CC: Jamie Chen <jamie_chen(a)compal.corp-partner.google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Jayvik Desai <jayvik(a)google.com> Gerrit-Attention: Eric Lai <ericllai(a)google.com> Gerrit-Attention: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Comment-Date: Tue, 21 Jan 2025 14:02:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Paul Menzel <paulepanter(a)mailbox.org>

1 0

[S] Change in coreboot[main]: mb/brya/var/uldrenite: Remove location setting in HDA verb tables
by John Su (Code Review) 21 Jan '25

21 Jan '25

Attention is currently required from: Dinesh Gehlot, Dtrain Hsu, Eric Lai, Jayvik Desai, John Su, Kapil Porwal, Nick Vaccaro, Subrata Banik. Hello Dinesh Gehlot, Dtrain Hsu, Eric Lai, Jayvik Desai, Kapil Porwal, Nick Vaccaro, Subrata Banik, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/86079?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+2 by Dtrain Hsu, Verified-1 by build bot (Jenkins) Change subject: mb/brya/var/uldrenite: Remove location setting in HDA verb tables ...................................................................... mb/brya/var/uldrenite: Remove location setting in HDA verb tables Update the HDA verb table to remove the location setting for uldrenite. BUG=b:374203133 TEST=emerge-nissa coreboot Change-Id: I05767ac80c2e3d609f944d0f669fcb343c1991ef Signed-off-by: John Su <john_su(a)compal.corp-partner.google.com> --- M src/mainboard/google/brya/variants/uldrenite/hda_verb.c 1 file changed, 14 insertions(+), 13 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/86079/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/86079?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I05767ac80c2e3d609f944d0f669fcb343c1991ef Gerrit-Change-Number: 86079 Gerrit-PatchSet: 2 Gerrit-Owner: John Su <john_su(a)compal.corp-partner.google.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Frank Wu <frank_wu(a)compal.corp-partner.google.com> Gerrit-CC: Jamie Chen <jamie_chen(a)compal.corp-partner.google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Jayvik Desai <jayvik(a)google.com> Gerrit-Attention: John Su <john_su(a)compal.corp-partner.google.com> Gerrit-Attention: Eric Lai <ericllai(a)google.com> Gerrit-Attention: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2025