diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:03:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:03:59 -0700 |
| commit | 085ff82c9c615d502d1e6754879d8d4ff590d143 (patch) | |
| tree | 5c29d4a691064adc6e5d62e29960a4be02a445b5 /arch | |
| parent | f63bafe55654caf3a62f73500eafd1b89ca6f7ff (diff) | |
| parent | 3dfc813d94bba2046c6aed216e0fd69ac93a8e03 (diff) | |
| download | linux-3.10-085ff82c9c615d502d1e6754879d8d4ff590d143.tar.gz linux-3.10-085ff82c9c615d502d1e6754879d8d4ff590d143.tar.bz2 linux-3.10-085ff82c9c615d502d1e6754879d8d4ff590d143.zip | |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: Don't use identity mapping for PCI devices behind bridges
intel-iommu: Use iommu_should_identity_map() at startup time too.
intel-iommu: No mapping for non-PCI devices
intel-iommu: Restore DMAR_BROKEN_GFX_WA option for broken graphics drivers
intel-iommu: Add iommu_should_identity_map() function
intel-iommu: Fix reattaching of devices to identity mapping domain
intel-iommu: Don't set identity mapping for bypassed graphics devices
intel-iommu: Fix dma vs. mm page confusion with aligned_nrpages()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c07f7220590..738bdc6b0f8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1913,6 +1913,18 @@ config DMAR_DEFAULT_ON recommended you say N here while the DMAR code remains experimental. +config DMAR_BROKEN_GFX_WA + def_bool n + prompt "Workaround broken graphics drivers (going away soon)" + depends on DMAR + ---help--- + Current Graphics drivers tend to use physical address + for DMA and avoid using DMA APIs. Setting this config + option permits the IOMMU driver to set a unity map for + all the OS-visible memory. Hence the driver can continue + to use physical addresses for DMA, at least until this + option is removed in the 2.6.32 kernel. + config DMAR_FLOPPY_WA def_bool y depends on DMAR |