diff options
| author | Ege Mihmanli <egemih@google.com> | 2018-01-07 18:03:07 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2018-01-10 20:57:17 +0000 |
| commit | bb9bdeb59480cade6f428237c6727d805d6c5f4c (patch) | |
| tree | 8155354b15fac50678564dd92684eacf16912b2d /src/soc | |
| parent | 1876f3ae4530fa691c9d6e88f3f7f8807d57d318 (diff) | |
soc/rockchip/rk3399: Ensure full eDP init sequence
This patch fixes 2 edp display issues:
1. When rk_edp_prepare fails >3 times, edp_init isn't run because
while-condition is not satisfied. Then, only a partial init sequence is
ran. This causes all aux transactions to fail.
2. If rk_edp_prepare never succeeds, coreboot never leaves link training
stage due to infinite loop. Boot process is stuck.
TEST=Boot past eDP initialization stage and make sure AP logs don't have
show aux transaction fails.
Change-Id: I44c3f53e8786558c43078d4afe9acde4d64796e7
Signed-off-by: Ege Mihmanli <egemih@google.com>
Reviewed-on: https://review.coreboot.org/23152
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/rockchip/rk3399/display.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c index b81e96f0fe..f27d78ed86 100644 --- a/src/soc/rockchip/rk3399/display.c +++ b/src/soc/rockchip/rk3399/display.c @@ -45,7 +45,7 @@ static void reset_edp(void) udelay(1); write32(&cru_ptr->softrst_con[17], RK_CLRBITS(1 << 12 | 1 << 13)); - printk(BIOS_WARNING, "Retrying epd initialization.\n"); + printk(BIOS_WARNING, "Retrying EDP initialization.\n"); } void rk_display_init(device_t dev) @@ -53,8 +53,9 @@ void rk_display_init(device_t dev) struct edid edid; struct soc_rockchip_rk3399_config *conf = dev->chip_info; enum vop_modes detected_mode = VOP_MODE_UNKNOWN; - int retry_count = 0; const struct mipi_panel_data *panel_data = NULL; + int retry_count_init = 0; + int retry_count_edp_prepare = 0; /* let's use vop0 in rk3399 */ uint32_t vop_id = 0; @@ -77,14 +78,17 @@ void rk_display_init(device_t dev) write32(&rk3399_grf->soc_con25, RK_SETBITS(1 << 11)); retry_edp: - while (retry_count++ < 3) { + /* Reset in case code jumped here. */ + retry_count_init = 0; + while (retry_count_init++ < 3) { rk_edp_init(); if (rk_edp_get_edid(&edid) == 0) { detected_mode = VOP_MODE_EDP; break; } - if (retry_count == 3) { - printk(BIOS_WARNING, "Warning: epd initialization failed.\n"); + if (retry_count_init == 3) { + printk(BIOS_WARNING, + "Warning: EDP initialization failed.\n"); return; } else { reset_edp(); @@ -159,8 +163,13 @@ retry_edp: case VOP_MODE_EDP: /* will enable edp in depthcharge */ if (rk_edp_prepare()) { - reset_edp(); - goto retry_edp; /* Rerun entire init sequence */ + if (retry_count_edp_prepare++ < 3) { + reset_edp(); + /* Rerun entire init sequence */ + goto retry_edp; + } + printk(BIOS_ERR, "EDP preparation failed."); + return; } break; default: |