<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25466">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/skylake/graphics: Ensure intel_gma_restore_opregion() is called<br><br>Change-Id: If981fa3db12b3a4fe1411f4cce9bac8564697769<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M src/soc/intel/skylake/graphics.c<br>1 file changed, 8 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/66/25466/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c</span><br><span>index 8991fa3..693c6c9 100644</span><br><span>--- a/src/soc/intel/skylake/graphics.c</span><br><span>+++ b/src/soc/intel/skylake/graphics.c</span><br><span>@@ -45,6 +45,11 @@</span><br><span>            graphics_gtt_write(DDI_BUF_CTL_A, ddi_buf_ctl);</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* IGD needs to Bus Master */</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 reg32 = pci_read_config32(dev, PCI_COMMAND);</span><br><span style="color: hsl(120, 100%, 40%);">+      reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;</span><br><span style="color: hsl(120, 100%, 40%);">+    pci_write_config32(dev, PCI_COMMAND, reg32);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       /*</span><br><span>    * GFX PEIM module inside FSP binary is taking care of graphics</span><br><span>       * initialization based on RUN_FSP_GOP Kconfig option and input</span><br><span>@@ -53,15 +58,9 @@</span><br><span>          * In case of non-FSP solution, SoC need to select another</span><br><span>    * Kconfig to perform GFX initialization.</span><br><span>     */</span><br><span style="color: hsl(0, 100%, 40%);">-     if (IS_ENABLED(CONFIG_RUN_FSP_GOP))</span><br><span style="color: hsl(0, 100%, 40%);">-             return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* IGD needs to Bus Master */</span><br><span style="color: hsl(0, 100%, 40%);">-   u32 reg32 = pci_read_config32(dev, PCI_COMMAND);</span><br><span style="color: hsl(0, 100%, 40%);">-        reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;</span><br><span style="color: hsl(0, 100%, 40%);">-      pci_write_config32(dev, PCI_COMMAND, reg32);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {</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%);">+         /* nothing to do */</span><br><span style="color: hsl(120, 100%, 40%);">+   } else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {</span><br><span>            if (!acpi_is_wakeup_s3() && display_init_required()) {</span><br><span>                       int lightup_ok;</span><br><span>                      gma_gfxinit(&lightup_ok);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25466">change 25466</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/25466"/><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: If981fa3db12b3a4fe1411f4cce9bac8564697769 </div>
<div style="display:none"> Gerrit-Change-Number: 25466 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>