<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26037">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel: unify VBT fetching API<br><br>Skylake used the inner function, wrapping it in the same set of tests as<br>the common code does, but expressed differently.<br><br>Change-Id: Ifa6912255e7874a6e80301d49128adda6f624209<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/soc/intel/skylake/chip_fsp20.c<br>1 file changed, 1 insertion(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/26037/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c</span><br><span>index 6e91816..07c9ee6 100644</span><br><span>--- a/src/soc/intel/skylake/chip_fsp20.c</span><br><span>+++ b/src/soc/intel/skylake/chip_fsp20.c</span><br><span>@@ -100,7 +100,7 @@</span><br><span>      uintptr_t vbt_data = 0;</span><br><span>      int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      int is_s3_wakeup = acpi_is_wakeup_s3();</span><br><span style="color: hsl(120, 100%, 40%);">+       vbt_data = (uintptr_t)vbt_get();</span><br><span> </span><br><span>         struct device *dev = SA_DEV_ROOT;</span><br><span>    if (!dev || !dev->chip_info) {</span><br><span>@@ -117,19 +117,6 @@</span><br><span>             printk(BIOS_DEBUG, "psys_pmax = %d\n", tconfig->PsysPmax);</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Load VBT */</span><br><span style="color: hsl(0, 100%, 40%);">-  if (is_s3_wakeup) {</span><br><span style="color: hsl(0, 100%, 40%);">-             printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n");</span><br><span style="color: hsl(0, 100%, 40%);">-     } else if (display_init_required() && IS_ENABLED(CONFIG_RUN_FSP_GOP)) {</span><br><span style="color: hsl(0, 100%, 40%);">-         /* Get VBT data */</span><br><span style="color: hsl(0, 100%, 40%);">-              vbt_data = (uintptr_t)locate_vbt();</span><br><span style="color: hsl(0, 100%, 40%);">-             if (vbt_data)</span><br><span style="color: hsl(0, 100%, 40%);">-                   printk(BIOS_DEBUG, "Passing VBT to GOP\n");</span><br><span style="color: hsl(0, 100%, 40%);">-           else</span><br><span style="color: hsl(0, 100%, 40%);">-                    printk(BIOS_DEBUG, "VBT not found!\n");</span><br><span style="color: hsl(0, 100%, 40%);">-       } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                printk(BIOS_DEBUG, "Not passing VBT to GOP\n");</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span>    params->GraphicsConfigPtr = (u32) vbt_data;</span><br><span> </span><br><span>   for (i = 0; i < ARRAY_SIZE(config->usb2_ports); i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26037">change 26037</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/26037"/><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: Ifa6912255e7874a6e80301d49128adda6f624209 </div>
<div style="display:none"> Gerrit-Change-Number: 26037 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>