From 97ae7849c6c255653ca5172ddb6f96b374691e67 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 19 Oct 2018 12:16:09 +0200 Subject: [kernel-vanilla] Always disable i915 iommu It's causing trouble left and right, and since we can't update the KCL on the servers out there, this is our temporary hack. --- core/modules/kernel-vanilla/patches/100-no-iommu-gfx.patch | 13 +++++++++++++ core/modules/kernel-vanilla/patches/i915-dell.patch | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 core/modules/kernel-vanilla/patches/100-no-iommu-gfx.patch delete mode 100644 core/modules/kernel-vanilla/patches/i915-dell.patch (limited to 'core/modules/kernel-vanilla') diff --git a/core/modules/kernel-vanilla/patches/100-no-iommu-gfx.patch b/core/modules/kernel-vanilla/patches/100-no-iommu-gfx.patch new file mode 100644 index 00000000..f690aaf3 --- /dev/null +++ b/core/modules/kernel-vanilla/patches/100-no-iommu-gfx.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c +index 07dc9381..5a324cb0 100644 +--- a/drivers/iommu/intel-iommu.c ++++ b/drivers/iommu/intel-iommu.c +@@ -480,7 +480,7 @@ int dmar_disabled = 1; + int intel_iommu_enabled = 0; + EXPORT_SYMBOL_GPL(intel_iommu_enabled); + +-static int dmar_map_gfx = 1; ++static int dmar_map_gfx = 0; + static int dmar_forcedac; + static int intel_iommu_strict; + static int intel_iommu_superpage = 1; diff --git a/core/modules/kernel-vanilla/patches/i915-dell.patch b/core/modules/kernel-vanilla/patches/i915-dell.patch deleted file mode 100644 index 039b4ad2..00000000 --- a/core/modules/kernel-vanilla/patches/i915-dell.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c -index 14e4b3722428..7456da22de69 100644 ---- a/drivers/iommu/intel-iommu.c -+++ b/drivers/iommu/intel-iommu.c -@@ -5325,6 +5325,7 @@ static void quirk_iommu_g4x_gfx(struct pci_dev *dev) - dmar_map_gfx = 0; - } - -+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x29b2, quirk_iommu_g4x_gfx); - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_g4x_gfx); - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_g4x_gfx); - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_g4x_gfx); -- cgit v1.2.3-55-g7522