summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-09-19 09:37:23 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-09-19 09:37:23 -0700
commit0c02a20ff7695f9c54cc7c013dda326270ccdac8 (patch)
treeb3ab998e983d625af1f9af318199b0c025000609
parent64de5af000e99f32dd49ff5dd9a0fd7db1f60305 (diff)
downloadlwn-0c02a20ff7695f9c54cc7c013dda326270ccdac8.tar.gz
lwn-0c02a20ff7695f9c54cc7c013dda326270ccdac8.zip
intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
Just make it depend on BROKEN for now, in case people scream really loud about it (and because we might want to keep some of this logic for an upcoming BIOS workaround, so I don't just want to rip it out entirely just yet). But for graphics devices, it really ought to be unnecessary. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--Documentation/Intel-IOMMU.txt6
-rw-r--r--arch/x86/Kconfig2
2 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/Intel-IOMMU.txt b/Documentation/Intel-IOMMU.txt
index 21bc416d887e..cf9431db8731 100644
--- a/Documentation/Intel-IOMMU.txt
+++ b/Documentation/Intel-IOMMU.txt
@@ -56,11 +56,7 @@ Graphics Problems?
------------------
If you encounter issues with graphics devices, you can try adding
option intel_iommu=igfx_off to turn off the integrated graphics engine.
-
-If it happens to be a PCI device included in the INCLUDE_ALL Engine,
-then try enabling CONFIG_DMAR_GFX_WA to setup a 1-1 map. We hear
-graphics drivers may be in process of using DMA api's in the near
-future and at that time this option can be yanked out.
+If this fixes anything, please ensure you file a bug reporting the problem.
Some exceptions to IOVA
-----------------------
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 738bdc6b0f8b..22a0fd132112 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1916,7 +1916,7 @@ config DMAR_DEFAULT_ON
config DMAR_BROKEN_GFX_WA
def_bool n
prompt "Workaround broken graphics drivers (going away soon)"
- depends on DMAR
+ depends on DMAR && BROKEN
---help---
Current Graphics drivers tend to use physical address
for DMA and avoid using DMA APIs. Setting this config