<p>Ege Mihmanli has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23152">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/rockchip/rk3399: Ensure correct init flow if edp_prepare fails<br><br>This patch fixes 2 edp display issues:<br>1. When rk_edp_prepare fails >3 times, edp_init isn't run because<br>while-condition is not satisfied. Then, only a partial init sequence is<br>ran.<br>2. If rk_edp_prepare never succeeds, coreboot never leaves link training<br>stage due to infinite loop.<br><br>Change-Id: I44c3f53e8786558c43078d4afe9acde4d64796e7<br>Signed-off-by: Ege Mihmanli <egemih@google.com><br>---<br>M src/soc/rockchip/rk3399/display.c<br>1 file changed, 12 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/23152/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c</span><br><span>index b81e96f..bbe50cc 100644</span><br><span>--- a/src/soc/rockchip/rk3399/display.c</span><br><span>+++ b/src/soc/rockchip/rk3399/display.c</span><br><span>@@ -45,7 +45,7 @@</span><br><span>            udelay(1);</span><br><span>   write32(&cru_ptr->softrst_con[17],</span><br><span>            RK_CLRBITS(1 << 12 | 1 << 13));</span><br><span style="color: hsl(0, 100%, 40%);">-     printk(BIOS_WARNING, "Retrying epd initialization.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+     printk(BIOS_WARNING, "Retrying EDP initialization.\n");</span><br><span> }</span><br><span> </span><br><span> void rk_display_init(device_t dev)</span><br><span>@@ -53,8 +53,8 @@</span><br><span>         struct edid edid;</span><br><span>    struct soc_rockchip_rk3399_config *conf = dev->chip_info;</span><br><span>         enum vop_modes detected_mode = VOP_MODE_UNKNOWN;</span><br><span style="color: hsl(0, 100%, 40%);">-        int retry_count = 0;</span><br><span>         const struct mipi_panel_data *panel_data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+      int retry_edp_count = 0;</span><br><span> </span><br><span>         /* let's use vop0 in rk3399 */</span><br><span>   uint32_t vop_id = 0;</span><br><span>@@ -77,6 +77,7 @@</span><br><span>             write32(&rk3399_grf->soc_con25, RK_SETBITS(1 << 11));</span><br><span> </span><br><span> retry_edp:</span><br><span style="color: hsl(120, 100%, 40%);">+          int retry_count = 0;</span><br><span>                 while (retry_count++ < 3) {</span><br><span>                       rk_edp_init();</span><br><span>                       if (rk_edp_get_edid(&edid) == 0) {</span><br><span>@@ -84,7 +85,8 @@</span><br><span>                           break;</span><br><span>                       }</span><br><span>                    if (retry_count == 3) {</span><br><span style="color: hsl(0, 100%, 40%);">-                         printk(BIOS_WARNING, "Warning: epd initialization failed.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                              printk(BIOS_WARNING,</span><br><span style="color: hsl(120, 100%, 40%);">+                                 "Warning: EDP initialization failed.\n");</span><br><span>                           return;</span><br><span>                      } else {</span><br><span>                             reset_edp();</span><br><span>@@ -159,8 +161,13 @@</span><br><span>  case VOP_MODE_EDP:</span><br><span>           /* will enable edp in depthcharge */</span><br><span>                 if (rk_edp_prepare()) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 reset_edp();</span><br><span style="color: hsl(0, 100%, 40%);">-                    goto retry_edp; /* Rerun entire init sequence */</span><br><span style="color: hsl(120, 100%, 40%);">+                      if(retry_edp_count++ < 3) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                reset_edp();</span><br><span style="color: hsl(120, 100%, 40%);">+                          /* Rerun entire init sequence */</span><br><span style="color: hsl(120, 100%, 40%);">+                              goto retry_edp;</span><br><span style="color: hsl(120, 100%, 40%);">+                       }</span><br><span style="color: hsl(120, 100%, 40%);">+                     printk(BIOS_WARNING, "EDP preparation failed.");</span><br><span style="color: hsl(120, 100%, 40%);">+                    return;</span><br><span>              }</span><br><span>            break;</span><br><span>       default:</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23152">change 23152</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23152"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I44c3f53e8786558c43078d4afe9acde4d64796e7 </div>
<div style="display:none"> Gerrit-Change-Number: 23152 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Ege Mihmanli <egemih@google.com> </div>