--- drivers/pci/intel-iommu.c

+++ drivers/pci/intel-iommu.c

@@ -382,7 +382,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;

@@ -1858,7 +1858,7 @@ static struct dmar_domain *get_domain_fo

ret = iommu_attach_domain(domain, iommu);

if (ret) {

- domain_exit(domain);

+ free_domain_mem(domain);

goto error;

}

@@ -3244,9 +3244,15 @@ static int device_notifier(struct notifi

if (!domain)

return 0;

- if (action == BUS_NOTIFY_UNBOUND_DRIVER && !iommu_pass_through)

+ if (action == BUS_NOTIFY_UNBOUND_DRIVER && !iommu_pass_through) {

domain_remove_one_dev_info(domain, pdev);

+ if (!(domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE) &&

+ !(domain->flags & DOMAIN_FLAG_STATIC_IDENTITY) &&

+ list_empty(&domain->devices))

+ domain_exit(domain);

+ }

+

return 0;

}

@@ -3393,6 +3399,11 @@ static void domain_remove_one_dev_info(s

domain->iommu_count--;

domain_update_iommu_cap(domain);

spin_unlock_irqrestore(&domain->iommu_lock, tmp_flags);

+

+ spin_lock_irqsave(&iommu->lock, tmp_flags);

+ clear_bit(domain->id, iommu->domain_ids);

+ iommu->domains[domain->id] = NULL;

+ spin_unlock_irqrestore(&iommu->lock, tmp_flags);

}

spin_unlock_irqrestore(&device_domain_lock, flags);

@@ -3730,6 +3741,12 @@ static void __devinit quirk_iommu_rwbf(s

*/

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);