<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30233">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/braswell: ensure ACPI opregion restored on S3 with GOP init<br><br>The Intel GMA ACPI opregion address needs to be set on S3 resume,<br>otherwise the Windows display driver fails to re-initialize correctly.<br>Fix by ensuring the address is set correctly regardless of display<br>init type used (GOP or VBIOS).<br><br>Test: build/boot on google/edgar, ensure internal display functional<br>following S3 resume under Windows 10.<br><br>Change-Id: I471c44e8ba4514e4a2ddf6739109b759145598ed<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/soc/intel/braswell/Makefile.inc<br>M src/soc/intel/braswell/gfx.c<br>2 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/30233/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc</span><br><span>index ac1bacd..fabbc2b 100644</span><br><span>--- a/src/soc/intel/braswell/Makefile.inc</span><br><span>+++ b/src/soc/intel/braswell/Makefile.inc</span><br><span>@@ -22,9 +22,8 @@</span><br><span> ramstage-$(CONFIG_ELOG) += elog.c</span><br><span> ramstage-y += emmc.c</span><br><span> ramstage-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-ifneq ($(CONFIG_RUN_FSP_GOP),y)</span><br><span> ramstage-y += gfx.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ramstage-y += gpio_support.c</span><br><span> ramstage-y += hda.c</span><br><span> ramstage-y += iosf.c</span><br><span>diff --git a/src/soc/intel/braswell/gfx.c b/src/soc/intel/braswell/gfx.c</span><br><span>index 895d2ee..9417409 100644</span><br><span>--- a/src/soc/intel/braswell/gfx.c</span><br><span>+++ b/src/soc/intel/braswell/gfx.c</span><br><span>@@ -68,15 +68,16 @@</span><br><span>   printk(BIOS_SPEW, "%s/%s (%s)\n",</span><br><span>                  __FILE__, __func__, dev_name(dev));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Pre VBIOS Init */</span><br><span style="color: hsl(0, 100%, 40%);">-    gfx_pre_vbios_init(dev);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!IS_ENABLED(CONFIG_RUN_FSP_GOP)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                /* Pre VBIOS Init */</span><br><span style="color: hsl(120, 100%, 40%);">+          gfx_pre_vbios_init(dev);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* Run VBIOS */</span><br><span style="color: hsl(0, 100%, 40%);">- pci_dev_init(dev);</span><br><span style="color: hsl(120, 100%, 40%);">+            /* Run VBIOS */</span><br><span style="color: hsl(120, 100%, 40%);">+               pci_dev_init(dev);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  /* Post VBIOS Init */</span><br><span style="color: hsl(0, 100%, 40%);">-   gfx_post_vbios_init(dev);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+             /* Post VBIOS Init */</span><br><span style="color: hsl(120, 100%, 40%);">+         gfx_post_vbios_init(dev);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span>    intel_gma_restore_opregion();</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30233">change 30233</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/c/coreboot/+/30233"/><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-Change-Id: I471c44e8ba4514e4a2ddf6739109b759145598ed </div>
<div style="display:none"> Gerrit-Change-Number: 30233 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>