Jesse Keating 2f82dd
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
Jesse Keating 2f82dd
index 4173125..baa32a0 100644
Jesse Keating 2f82dd
--- a/drivers/pci/intel-iommu.c
Jesse Keating 2f82dd
+++ b/drivers/pci/intel-iommu.c
Jesse Keating 2f82dd
@@ -340,7 +340,7 @@ int dmar_disabled = 0;
Jesse Keating 2f82dd
 int dmar_disabled = 1;
Jesse Keating 2f82dd
 #endif /*CONFIG_DMAR_DEFAULT_ON*/
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
-static int __initdata dmar_map_gfx = 1;
Jesse Keating 2f82dd
+static int dmar_map_gfx = 1;
Jesse Keating 2f82dd
 static int dmar_forcedac;
Jesse Keating 2f82dd
 static int intel_iommu_strict;
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
@@ -3728,6 +3728,12 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
Jesse Keating 2f82dd
 	 */
Jesse Keating 2f82dd
 	printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
Jesse Keating 2f82dd
 	rwbf_quirk = 1;
Jesse Keating 2f82dd
+
Jesse Keating 2f82dd
+	/* https://bugzilla.redhat.com/show_bug.cgi?id=538163 */
Jesse Keating 2f82dd
+	if (dev->revision == 0x07) {
Jesse Keating 2f82dd
+		printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n");
Jesse Keating 2f82dd
+		dmar_map_gfx = 0;
Jesse Keating 2f82dd
+	}
Jesse Keating 2f82dd
 }
Jesse Keating 2f82dd
 
Jesse Keating 2f82dd
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);