diff options
Diffstat (limited to 'debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch')
| -rw-r--r-- | debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch b/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch index a3543d90e..6950c937d 100644 --- a/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch +++ b/debian/patches/features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch @@ -22,7 +22,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -2053,6 +2053,8 @@ +@@ -2122,6 +2122,8 @@ bypassed by not enabling DMAR with this option. In this case, gfx device will use physical address for DMA. @@ -33,7 +33,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> sp_off [Default Off] --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -35,6 +35,9 @@ +@@ -36,6 +36,9 @@ #define CONTEXT_SIZE VTD_PAGE_SIZE #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY) @@ -43,7 +43,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> #define IS_USB_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_SERIAL_USB) #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA) #define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e) -@@ -293,12 +296,14 @@ int intel_iommu_enabled = 0; +@@ -291,12 +294,14 @@ int intel_iommu_enabled = 0; EXPORT_SYMBOL_GPL(intel_iommu_enabled); static int dmar_map_gfx = 1; @@ -57,8 +57,8 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> +#define IDENTMAP_INTGPU 8 const struct iommu_ops intel_iommu_ops; - -@@ -337,6 +342,9 @@ static int __init intel_iommu_setup(char + static const struct iommu_dirty_ops intel_dirty_ops; +@@ -336,6 +341,9 @@ static int __init intel_iommu_setup(char } else if (!strncmp(str, "igfx_off", 8)) { dmar_map_gfx = 0; pr_info("Disable GFX device mapping\n"); @@ -68,7 +68,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> } else if (!strncmp(str, "forcedac", 8)) { pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n"); iommu_dma_forcedac = true; -@@ -2582,6 +2590,9 @@ static int device_def_domain_type(struct +@@ -2548,6 +2556,9 @@ static int device_def_domain_type(struct if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev)) return IOMMU_DOMAIN_IDENTITY; @@ -78,7 +78,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> } return 0; -@@ -2985,6 +2996,9 @@ static int __init init_dmars(void) +@@ -2855,6 +2866,9 @@ static int __init init_dmars(void) if (!dmar_map_gfx) iommu_identity_mapping |= IDENTMAP_GFX; |