diff options
Diffstat (limited to 'debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch')
| -rw-r--r-- | debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch index a4576e75f4..fedbab5d78 100644 --- a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch +++ b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch @@ -15,7 +15,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- --- a/drivers/iommu/intel/Kconfig +++ b/drivers/iommu/intel/Kconfig -@@ -56,14 +56,25 @@ config INTEL_IOMMU_SVM +@@ -57,13 +57,24 @@ config INTEL_IOMMU_SVM to access DMA resources through process address space by means of a Process Address Space ID (PASID). @@ -41,15 +41,14 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> + +config INTEL_IOMMU_DEFAULT_OFF + bool "Disable" - ++ +endchoice -+ - config INTEL_IOMMU_BROKEN_GFX_WA - bool "Workaround broken graphics drivers (going away soon)" - depends on BROKEN && X86 + + config INTEL_IOMMU_FLOPPY_WA + def_bool y --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -284,14 +284,14 @@ static LIST_HEAD(dmar_satc_units); +@@ -218,13 +218,13 @@ static LIST_HEAD(dmar_satc_units); static void intel_iommu_domain_free(struct iommu_domain *domain); @@ -60,13 +59,12 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> int intel_iommu_enabled = 0; EXPORT_SYMBOL_GPL(intel_iommu_enabled); - static int dmar_map_gfx = 1; -static int dmar_map_intgpu = 1; +static int dmar_map_intgpu = IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); static int intel_iommu_superpage = 1; static int iommu_identity_mapping; static int iommu_skip_te_disable; -@@ -333,6 +333,7 @@ static int __init intel_iommu_setup(char +@@ -263,6 +263,7 @@ static int __init intel_iommu_setup(char while (*str) { if (!strncmp(str, "on", 2)) { dmar_disabled = 0; |