[coreboot-gerrit] Change in coreboot[master]: nb/intel/sandybridge/gma: Do not run VBIOS on libgfxinit

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/20288


Change subject: nb/intel/sandybridge/gma: Do not run VBIOS on libgfxinit
......................................................................

nb/intel/sandybridge/gma: Do not run VBIOS on libgfxinit

Do not run VBIOS in case libgfxinit has been selected.
Move gma_pm_init_post_vbios to cover native graphics init.

Change-Id: I3c92526a7eefd55b5ffc3bd00faa5030fe565353
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
M src/northbridge/intel/sandybridge/gma.c
1 file changed, 6 insertions(+), 7 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/20288/1

diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 10eddd3..41c48dc 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -608,13 +608,6 @@
 	/* Init graphics power management */
 	gma_pm_init_pre_vbios(dev);
 
-	if (!IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT))
-		/* PCI Init, will run VBIOS */
-		pci_dev_init(dev);
-
-	/* Post VBIOS init */
-	gma_pm_init_post_vbios(dev);
-
 	if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) ||
 	    IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
 		/* This should probably run before post VBIOS init. */
@@ -637,8 +630,14 @@
 		}
 		if (lightup_ok)
 			gfx_set_init_done(1);
+	} else {
+		/* PCI Init, will run VBIOS */
+		pci_dev_init(dev);
 	}
 
+	/* Post VBIOS init */
+	gma_pm_init_post_vbios(dev);
+
 	if (acpi_is_wakeup_s3()) {
 		/* GNVS has been already set up */
 		const global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);

-- 
To view, visit https://review.coreboot.org/20288
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c92526a7eefd55b5ffc3bd00faa5030fe565353
Gerrit-Change-Number: 20288
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170620/e460433e/attachment.html>