Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[sfrench/cifs-2.6.git] / drivers / iommu / intel / Kconfig

diff --git a/drivers/iommu/intel/Kconfig b/drivers/iommu/intel/Kconfig
index 95d9f4e1a17626c2dba01a093d3a7076b227076c..f52fb39c968eb1e7b38ce808cade3a0da6b32f0c 100644 (file)
--- a/drivers/iommu/intel/Kconfig
+++ b/drivers/iommu/intel/Kconfig
@@ -51,6 +51,7 @@ config INTEL_IOMMU_SVM
        depends on X86_64
        select MMU_NOTIFIER
        select IOMMU_SVA
+       select IOMMU_IOPF
        help
          Shared Virtual Memory (SVM) provides a facility for devices
          to access DMA resources through process address space by
@@ -64,17 +65,6 @@ config INTEL_IOMMU_DEFAULT_ON
          one is found. If this option is not selected, DMAR support can
          be enabled by passing intel_iommu=on to the kernel.
 
-config INTEL_IOMMU_BROKEN_GFX_WA
-       bool "Workaround broken graphics drivers (going away soon)"
-       depends on BROKEN && X86
-       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 INTEL_IOMMU_FLOPPY_WA
        def_bool y
        depends on X86