[coreboot-gerrit] Patch set updated for coreboot: device/device: handle multiple VGA devices

[Patrick Rudolph (siro@das-labor.org)]

Patrick Rudolph (siro at das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12897

-gerrit

commit bb65010e39fe5d9c34bab833380daf1ac5e4b01f
Author: Patrick Rudolph <siro at das-labor.org>
Date:   Sat Dec 26 08:27:20 2015 +0100

    device/device: handle multiple VGA devices
    
    Add nvram option "dual_graphics_mode" to switch between
    VGA devices.
    As dual_graphics_mode is 0 or not set, the existing code
    will run and disable devices based on CONFIG_VGA_IS_PRIMARY.
    dual_graphics_mode is 1 and an onboard VGA device exists,
    disable all other VGA devices.
    dual_graphics_mode is 2 and non onboard VGA device exists,
    disable all other VGA devices.
    dual_graphics_mode is 3 isn't handled yet, and could be used for
    multiple VGA devices active at once.
    
    Tested on Lenovo T530 using Nvidia NVS 5400m.
    
    Change-Id: Ie37ec4aeae8ab49fe8e26438c430911d1815551c
    Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
 src/device/device.c | 80 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/src/device/device.c b/src/device/device.c
index e23c9de..45db04e 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -44,6 +44,7 @@
 #include <arch/ebda.h>
 #endif
 #include <timer.h>
+#include <option.h>
 
 /** Linked list of ALL devices */
 struct device *all_devices = &dev_root;
@@ -748,28 +749,49 @@ static void avoid_fixed_resources(struct device *dev)
 	}
 }
 
+static struct device *get_next_vga_dev(struct device *dev)
+{
+	while ((dev = dev_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev))) {
+		if (!dev->enabled)
+			continue;
+
+		return dev;
+	}
+	return NULL;
+}
+
+static void disable_other_vga_devs(struct device *dev_keep)
+{
+	struct device *dev = NULL;
+
+	while ((dev = get_next_vga_dev(dev))) {
+		/* disable unused devices to save power */
+		if (dev != dev_keep) {
+			if (dev->ops && dev->ops->disable)
+				dev->ops->disable(dev);
+			else
+				dev->enabled = 0;
+		}
+	}
+}
+
 device_t vga_pri = 0;
 static void set_vga_bridge_bits(void)
 {
-	/*
-	 * FIXME: Modify set_vga_bridge() so it is less PCI-centric!
-	 * This function knows too much about PCI stuff, it should be just
-	 * an iterator/visitor.
-	 */
-
 	/* FIXME: Handle the VGA palette snooping. */
 	struct device *dev, *vga, *vga_onboard;
 	struct bus *bus;
+	u8 dual_graphics_mode;
+
+	if (get_option(&dual_graphics_mode, "dual_graphics_mode") != CB_SUCCESS)
+		dual_graphics_mode = 0;
 
 	bus = 0;
 	vga = 0;
 	vga_onboard = 0;
 
 	dev = NULL;
-	while ((dev = dev_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev))) {
-		if (!dev->enabled)
-			continue;
-
+	while ((dev = get_next_vga_dev(dev))) {
 		printk(BIOS_DEBUG, "found VGA at %s\n", dev_path(dev));
 
 		if (dev->on_mainboard) {
@@ -782,18 +804,38 @@ static void set_vga_bridge_bits(void)
 		dev->command &= ~(PCI_COMMAND_MEMORY | PCI_COMMAND_IO);
 	}
 
-	if (!vga)
-		vga = vga_onboard;
+	if ((dual_graphics_mode == 1) && vga_onboard) {
+		/* Use chipset VGA and disable plugin VGA */
+		printk(BIOS_DEBUG, "Use integrated graphics over plugin.\n");
 
-	if (CONFIG_ONBOARD_VGA_IS_PRIMARY && vga_onboard)
-		vga = vga_onboard;
+		disable_other_vga_devs(vga_onboard);
 
-	/* If we prefer plugin VGA over chipset VGA, the chipset might
-	   want to know. */
-	if (!CONFIG_ONBOARD_VGA_IS_PRIMARY && (vga != vga_onboard) &&
-		vga_onboard && vga_onboard->ops && vga_onboard->ops->disable) {
+		vga = vga_onboard;
+	} else if ((dual_graphics_mode == 2) && vga) {
+		/* Use plugin VGA and disable chipset VGA */
 		printk(BIOS_DEBUG, "Use plugin graphics over integrated.\n");
-		vga_onboard->ops->disable(vga_onboard);
+
+		disable_other_vga_devs(vga);
+	} else {
+		if (!vga)
+			vga = vga_onboard;
+
+		if (CONFIG_ONBOARD_VGA_IS_PRIMARY && vga_onboard)
+			vga = vga_onboard;
+
+		/* If we prefer plugin VGA over chipset VGA, the chipset might
+		   want to know. */
+		if (!CONFIG_ONBOARD_VGA_IS_PRIMARY && (vga != vga_onboard) &&
+			vga_onboard) {
+			printk(BIOS_DEBUG, "Use plugin graphics over integrated.\n");
+
+			if (vga_onboard->ops && vga_onboard->ops->disable)
+				vga_onboard->ops->disable(vga_onboard);
+			else
+				vga_onboard->enabled = 0;
+		}
+
+		disable_other_vga_devs(vga);
 	}
 
 	if (vga) {