From 8bc5e794afac5825622100b3889f50d1038430f8 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Mon, 16 Apr 2012 16:26:04 -0400
Subject: [PATCH] --- yaml --- r: 307091 b: refs/heads/master c:
 88674088d10ca2538b2efd2559f6620ade8ec373 h: refs/heads/master i:   307089:
 592d815dac6ca867f3d7b9e0a788e21cc9d56e90   307087:
 3a6dd9bc81e9a50c5959d87423c8bee1bc0ab59e v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/video/fbdev.c | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 63698235b1db..e4073112660a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fbe8c7c3ebfed2059a6597322bb0dbc4d96feb5
+refs/heads/master: 88674088d10ca2538b2efd2559f6620ade8ec373
diff --git a/trunk/arch/x86/video/fbdev.c b/trunk/arch/x86/video/fbdev.c
index c5ffb6ac8707..d5644bbe8cba 100644
--- a/trunk/arch/x86/video/fbdev.c
+++ b/trunk/arch/x86/video/fbdev.c
@@ -9,24 +9,34 @@
 #include <linux/fb.h>
 #include <linux/pci.h>
 #include <linux/module.h>
+#include <linux/vgaarb.h>
 
 int fb_is_primary_device(struct fb_info *info)
 {
 	struct device *device = info->device;
 	struct pci_dev *pci_dev = NULL;
+	struct pci_dev *default_device = vga_default_device();
 	struct resource *res = NULL;
-	int retval = 0;
 
 	if (device)
 		pci_dev = to_pci_dev(device);
 
-	if (pci_dev)
-		res = &pci_dev->resource[PCI_ROM_RESOURCE];
+	if (!pci_dev)
+		return 0;
+
+	if (default_device) {
+		if (pci_dev == default_device)
+			return 1;
+		else
+			return 0;
+	}
+
+	res = &pci_dev->resource[PCI_ROM_RESOURCE];
 
 	if (res && res->flags & IORESOURCE_ROM_SHADOW)
-		retval = 1;
+		return 1;
 
-	return retval;
+	return 0;
 }
 EXPORT_SYMBOL(fb_is_primary_device);
 MODULE_LICENSE("GPL");