[coreboot-gerrit] Change in ...coreboot[master]: soc/intel/skylake: ensure ACPI opregion restored on S3 with GOP init

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30232


Change subject: soc/intel/skylake: ensure ACPI opregion restored on S3 with GOP init
......................................................................

soc/intel/skylake: ensure ACPI opregion restored on S3 with GOP init

The Intel GMA ACPI opregion address needs to be set on S3 resume,
otherwise the Windows display driver fails to re-initialize correctly.
Fix by ensuring the address is set correctly regardless of display
init type used (GOP, VBIOS, or libgfxinit).

Test: build/boot on google/chell, ensure internal display functional
following S3 resume under Windows 10.

Change-Id: I38a7f3df476c878e7a78ee6543270d71463cb69d
Signed-off-by: Matt DeVillier <matt.devillier at gmail.com>
---
M src/soc/intel/skylake/graphics.c
1 file changed, 14 insertions(+), 14 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/30232/1

diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c
index 33841b3..76d86e1 100644
--- a/src/soc/intel/skylake/graphics.c
+++ b/src/soc/intel/skylake/graphics.c
@@ -53,23 +53,23 @@
 	 * In case of non-FSP solution, SoC need to select another
 	 * Kconfig to perform GFX initialization.
 	 */
-	if (IS_ENABLED(CONFIG_RUN_FSP_GOP))
-		return;
+	if (!IS_ENABLED(CONFIG_RUN_FSP_GOP)) {
 
-	/* IGD needs to Bus Master */
-	u32 reg32 = pci_read_config32(dev, PCI_COMMAND);
-	reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
-	pci_write_config32(dev, PCI_COMMAND, reg32);
+		/* IGD needs to Bus Master */
+		u32 reg32 = pci_read_config32(dev, PCI_COMMAND);
+		reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
+		pci_write_config32(dev, PCI_COMMAND, reg32);
 
-	if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
-		if (!acpi_is_wakeup_s3() && display_init_required()) {
-			int lightup_ok;
-			gma_gfxinit(&lightup_ok);
-			gfx_set_init_done(lightup_ok);
+		if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
+			if (!acpi_is_wakeup_s3() && display_init_required()) {
+				int lightup_ok;
+				gma_gfxinit(&lightup_ok);
+				gfx_set_init_done(lightup_ok);
+			}
+		} else {
+			/* Initialize PCI device, load/execute BIOS Option ROM */
+			pci_dev_init(dev);
 		}
-	} else {
-		/* Initialize PCI device, load/execute BIOS Option ROM */
-		pci_dev_init(dev);
 	}
 
 	intel_gma_restore_opregion();

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/30232
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I38a7f3df476c878e7a78ee6543270d71463cb69d
Gerrit-Change-Number: 30232
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181214/90ee12f3/attachment.html>