From 5f23d008954e6adc25581e76d4ef2fdf3efff009 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 19 Sep 2009 09:37:23 -0700 Subject: [PATCH] --- yaml --- r: 165432 b: refs/heads/master c: 0c02a20ff7695f9c54cc7c013dda326270ccdac8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/Intel-IOMMU.txt | 6 +----- trunk/arch/x86/Kconfig | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a4069cc22a60..627145dc9fee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64de5af000e99f32dd49ff5dd9a0fd7db1f60305 +refs/heads/master: 0c02a20ff7695f9c54cc7c013dda326270ccdac8 diff --git a/trunk/Documentation/Intel-IOMMU.txt b/trunk/Documentation/Intel-IOMMU.txt index 21bc416d887e..cf9431db8731 100644 --- a/trunk/Documentation/Intel-IOMMU.txt +++ b/trunk/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/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 738bdc6b0f8b..22a0fd132112 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/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