From 4369f33c3c6881949fecae99722a149db8dba3a8 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 15 Jun 2010 10:57:57 +0100
Subject: [PATCH] --- yaml --- r: 200455 b: refs/heads/master c:
 2d9e667efdfb4e986074d98e7d9a424003c7c43b h: refs/heads/master i:   200453:
 183dfe231b071492feb46edc4a1b1b704a963b5a   200451:
 6c666e22612452b7563640b5a8b50acc43d7d8bb   200447:
 5477c921eea1c762f8b5ca0a36110f8eb6a24201 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/intel-iommu.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 80872bdc9679..075edd592893 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00dfff77e7184140dc45724c7232e99302f6bf97
+refs/heads/master: 2d9e667efdfb4e986074d98e7d9a424003c7c43b
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index bf8fd913d064..c9171be74564 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -340,7 +340,7 @@ int dmar_disabled = 0;
 int dmar_disabled = 1;
 #endif /*CONFIG_DMAR_DEFAULT_ON*/
 
-static int __initdata dmar_map_gfx = 1;
+static int dmar_map_gfx = 1;
 static int dmar_forcedac;
 static int intel_iommu_strict;
 
@@ -3721,6 +3721,12 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
 	 */
 	printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
 	rwbf_quirk = 1;
+
+	/* https://bugzilla.redhat.com/show_bug.cgi?id=538163 */
+	if (dev->revision == 0x07) {
+		printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n");
+		dmar_map_gfx = 0;
+	}
 }
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);