From 347dc8d13edd5c6eb9e3d1468898a283b8b98b1c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 1 Jun 2012 11:12:39 +0100
Subject: [PATCH] --- yaml --- r: 310101 b: refs/heads/master c:
 08ef8e41a6f420c3c0998b50d478e0b2c267a226 h: refs/heads/master i:   310099:
 136a501037fc98fa64a32420d63d219707781cb7 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/gpu/drm/mgag200/mgag200_drv.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ef8b877741d2..f4c99bba0aed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dedc14e2a6e85b357c2274e03af354201e0b5626
+refs/heads/master: 08ef8e41a6f420c3c0998b50d478e0b2c267a226
diff --git a/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c b/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c
index 3c8e04f54713..93e832d6c328 100644
--- a/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/trunk/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -41,9 +41,28 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
 
 MODULE_DEVICE_TABLE(pci, pciidlist);
 
+static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev)
+{
+	struct apertures_struct *ap;
+	bool primary = false;
+
+	ap = alloc_apertures(1);
+	ap->ranges[0].base = pci_resource_start(pdev, 0);
+	ap->ranges[0].size = pci_resource_len(pdev, 0);
+
+#ifdef CONFIG_X86
+	primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
+#endif
+	remove_conflicting_framebuffers(ap, "mgag200drmfb", primary);
+	kfree(ap);
+}
+
+
 static int __devinit
 mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+	mgag200_kick_out_firmware_fb(pdev);
+
 	return drm_get_pci_dev(pdev, ent, &driver);
 }