diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 17:14:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 17:14:04 +0000 |
| commit | 6e8120921499e4a35115d4623621b7729178c9e7 (patch) | |
| tree | 188a21432c3b8e8ddb8a08e9a09397164a88181c /debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch | |
| parent | Merging upstream version 6.9.7. (diff) | |
| download | linux-6e8120921499e4a35115d4623621b7729178c9e7.tar.xz linux-6e8120921499e4a35115d4623621b7729178c9e7.zip | |
Adding debian version 6.9.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
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 | 17 |
1 files changed, 8 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 824092bcd0..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 @@ -18,7 +18,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> @@ -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). - + -config INTEL_IOMMU_DEFAULT_ON - bool "Enable Intel DMA Remapping Devices by default" - default y @@ -43,29 +43,28 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> + bool "Disable" + +endchoice - + config INTEL_IOMMU_FLOPPY_WA def_bool y --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -218,14 +218,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); - + -int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); +int dmar_disabled = IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_OFF); int intel_iommu_sm = IS_ENABLED(CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON); - + 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; -@@ -264,6 +264,7 @@ static int __init intel_iommu_setup(char *str) +@@ -263,6 +263,7 @@ static int __init intel_iommu_setup(char while (*str) { if (!strncmp(str, "on", 2)) { dmar_disabled = 0; |