summaryrefslogtreecommitdiffstats
path: root/linux-2.6-intel-iommu-igfx.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-26 18:23:52 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-26 21:03:18 -0400
commit34f9218fe519cd922889076cc7698bd73bdb9f92 (patch)
tree50217145a1dd12d404471d7c32f1093ffdc916b7 /linux-2.6-intel-iommu-igfx.patch
parent829bffe3f94cfbe50c418900af3d6eb9df27d59e (diff)
downloadkernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.gz
kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.xz
kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.zip
Linux 3.1-git1 (138c4ae9cfda upstream)
First take on the upcomming Linux 3.2 kernel. The moving of the ethernet drivers into vendor subdirectories caused a lot of churn in config-generic, but hopefully it's a bit cleaner now.
Diffstat (limited to 'linux-2.6-intel-iommu-igfx.patch')
-rw-r--r--linux-2.6-intel-iommu-igfx.patch33
1 files changed, 15 insertions, 18 deletions
diff --git a/linux-2.6-intel-iommu-igfx.patch b/linux-2.6-intel-iommu-igfx.patch
index b2f8f19e3..d54ae3cb2 100644
--- a/linux-2.6-intel-iommu-igfx.patch
+++ b/linux-2.6-intel-iommu-igfx.patch
@@ -1,6 +1,7 @@
-Subject: [PATCH] [intel_iommu] Default to igfx_off
+From e13491e4c394907ffdd834aeccca279213818079 Mon Sep 17 00:00:00 2001
From: drago01 <drago01@gmail.com>
-To: fedora-kernel-list <fedora-kernel-list@redhat.com>
+Date: Wed, 26 Oct 2011 13:37:27 -0400
+Subject: [PATCH] Default to igfx_off
This option seems to causes way to many issues, it is
being investigated by Intel's chipset team for months now and
@@ -16,14 +17,14 @@ Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
Documentation/kernel-parameters.txt | 11 +++++------
- drivers/pci/intel-iommu.c | 9 +++++----
+ drivers/iommu/intel-iommu.c | 9 +++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index e7848a0..9914485 100644
+index a8ba119..8ddc43a 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -992,12 +992,11 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -998,12 +998,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
Enable intel iommu driver.
off
Disable intel iommu driver.
@@ -40,22 +41,22 @@ index e7848a0..9914485 100644
+ mapped as normal device.
forcedac [x86_64]
With this option iommu will not optimize to look
- for io virtual address below 32 bit forcing dual
-diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
-index 4173125..8f36786 100644
+ for io virtual address below 32-bit forcing dual
+diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
+index be1953c..2e23af1 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
-@@ -340,7 +340,8 @@ int dmar_disabled = 0;
+@@ -404,7 +404,8 @@ int dmar_disabled = 0;
int dmar_disabled = 1;
- #endif /*CONFIG_DMAR_DEFAULT_ON*/
-
+ #endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/
+
-static int dmar_map_gfx = 1;
+/* disabled by default; causes way too many issues */
+static int dmar_map_gfx = 0;
static int dmar_forcedac;
static int intel_iommu_strict;
-
-@@ -361,10 +362,10 @@ static int __init intel_iommu_setup(char *str)
+ static int intel_iommu_superpage = 1;
+@@ -429,10 +430,10 @@ static int __init intel_iommu_setup(char *str)
} else if (!strncmp(str, "off", 3)) {
dmar_disabled = 1;
printk(KERN_INFO "Intel-IOMMU: disabled\n");
@@ -70,9 +71,5 @@ index 4173125..8f36786 100644
printk(KERN_INFO
"Intel-IOMMU: Forcing DAC for PCI devices\n");
--
-1.6.6.1
-_______________________________________________
-kernel mailing list
-kernel@lists.fedoraproject.org
-https://admin.fedoraproject.org/mailman/listinfo/kernel
+1.7.6.4