<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20288">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/intel/sandybridge/gma: Do not run VBIOS on libgfxinit<br><br>Do not run VBIOS in case libgfxinit has been selected.<br>Move gma_pm_init_post_vbios to cover native graphics init.<br><br>Change-Id: I3c92526a7eefd55b5ffc3bd00faa5030fe565353<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M src/northbridge/intel/sandybridge/gma.c<br>1 file changed, 6 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/20288/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c<br>index 10eddd3..41c48dc 100644<br>--- a/src/northbridge/intel/sandybridge/gma.c<br>+++ b/src/northbridge/intel/sandybridge/gma.c<br>@@ -608,13 +608,6 @@<br>    /* Init graphics power management */<br>  gma_pm_init_pre_vbios(dev);<br> <br>-       if (!IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT))<br>-                /* PCI Init, will run VBIOS */<br>-               pci_dev_init(dev);<br>-<br>-        /* Post VBIOS init */<br>-        gma_pm_init_post_vbios(dev);<br>-<br>       if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) ||<br>            IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {<br>            /* This should probably run before post VBIOS init. */<br>@@ -637,8 +630,14 @@<br>          }<br>             if (lightup_ok)<br>                       gfx_set_init_done(1);<br>+        } else {<br>+             /* PCI Init, will run VBIOS */<br>+               pci_dev_init(dev);<br>    }<br> <br>+ /* Post VBIOS init */<br>+        gma_pm_init_post_vbios(dev);<br>+<br>       if (acpi_is_wakeup_s3()) {<br>            /* GNVS has been already set up */<br>            const global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);<br></pre><p>To view, visit <a href="https://review.coreboot.org/20288">change 20288</a>. To unsubscribe, 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/20288"/><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: I3c92526a7eefd55b5ffc3bd00faa5030fe565353 </div>
<div style="display:none"> Gerrit-Change-Number: 20288 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>