From: Marc Jones <marcj303@gmail.com>
Date: Tue, 21 Feb 2012 16:44:35 +0000 (+0100)
Subject: Revert "Fix multipleVGA cards resource conflict on Windows"
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=coreboot.git;a=commitdiff_plain;h=80bd74c21e5dcca3e9aa8543e086405142900664

Revert "Fix multipleVGA cards resource conflict on Windows"

This reverts commit 8660a1aa56caeb31bfaf15464285ca650638515e

This commit has been found to cause problems with vbios and option rom init
in seabios. It has been found by several people and requires more analysis
before being recommitted.

Change-Id: Ie5f54e417e7a0d8bd8ca4c0a573976afeaa9e230
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/671
Tested-by: build bot (Jenkins)
Reviewed-by: Denis Carikli <GNUtoo@no-log.org>
Reviewed-by: Marc Jones <marcj303@gmail.com>
---

diff --git a/src/devices/device.c b/src/devices/device.c
index 8ad978743..a2619bf00 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -932,6 +932,10 @@ void dev_configure(void)
 	struct device *root;
 	struct device *child;
 
+#if CONFIG_VGA_BRIDGE_SETUP == 1
+	set_vga_bridge_bits();
+#endif
+
 	printk(BIOS_INFO, "Allocating resources...\n");
 
 	root = &dev_root;
@@ -1024,10 +1028,6 @@ void dev_configure(void)
 	printk(BIOS_INFO, "Done setting resources.\n");
 	print_resource_tree(root, BIOS_SPEW, "After assigning values.");
 
-#if CONFIG_VGA_BRIDGE_SETUP == 1
-	set_vga_bridge_bits();
-#endif
-
 	printk(BIOS_INFO, "Done allocating resources.\n");
 }