diff options
| author | Simon Rettberg | 2018-10-19 12:16:09 +0200 |
|---|---|---|
| committer | Your Name | 2018-10-19 12:16:09 +0200 |
| commit | 97ae7849c6c255653ca5172ddb6f96b374691e67 (patch) | |
| tree | 0ade3fa01ba82c3280a83dc85a23382b5f651d67 /core/modules/kernel-vanilla | |
| parent | [vbox-src] Fix extpack permissions (diff) | |
| download | mltk-97ae7849c6c255653ca5172ddb6f96b374691e67.tar.gz mltk-97ae7849c6c255653ca5172ddb6f96b374691e67.tar.xz mltk-97ae7849c6c255653ca5172ddb6f96b374691e67.zip | |
[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.
Diffstat (limited to 'core/modules/kernel-vanilla')
| -rw-r--r-- | core/modules/kernel-vanilla/patches/100-no-iommu-gfx.patch | 13 | ||||
| -rw-r--r-- | core/modules/kernel-vanilla/patches/i915-dell.patch | 12 |
2 files changed, 13 insertions, 12 deletions
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); |