rpms/kernel/F-12 linux-2.6-intel-iommu-updates.patch,1.2,1.3

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17422

Modified Files:
	linux-2.6-intel-iommu-updates.patch 
Log Message:
don't kill BROKEN_GFX_WA

linux-2.6-intel-iommu-updates.patch:
 Documentation/Intel-IOMMU.txt  |    6 
 arch/ia64/kernel/pci-swiotlb.c |    2 
 arch/x86/kernel/pci-swiotlb.c  |    5 
 drivers/pci/dmar.c             |   50 ++++-
 drivers/pci/intel-iommu.c      |  399 ++++++++++++++++++++++++-----------------
 drivers/pci/intr_remapping.c   |    8 
 drivers/pci/iova.c             |   16 -
 include/linux/intel-iommu.h    |    2 
 include/linux/iova.h           |    1 
 9 files changed, 294 insertions(+), 195 deletions(-)

Index: linux-2.6-intel-iommu-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-intel-iommu-updates.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:12:03 -0000	1.2
+++ linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:24:09 -0000	1.3
@@ -1,3 +1,5 @@
+(Reverted the part which kills BROKEN_GFX_WA)
+
 commit e0fc7e0b4b5e69616f10a894ab9afff3c64be74e
 Author: David Woodhouse <David.Woodhouse at intel.com>
 Date:   Wed Sep 30 09:12:17 2009 -0700
@@ -461,19 +463,6 @@ index 223abb1..285aae8 100644
  #ifdef CONFIG_IA64_GENERIC
  		swiotlb = 1;
  		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 13ffa5d..5499da1 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1916,7 +1916,7 @@ config DMAR_DEFAULT_ON
- config DMAR_BROKEN_GFX_WA
- 	def_bool n
- 	prompt "Workaround broken graphics drivers (going away soon)"
--	depends on DMAR
-+	depends on DMAR && BROKEN
- 	---help---
- 	  Current Graphics drivers tend to use physical address
- 	  for DMA and avoid using DMA APIs. Setting this config
 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
 index 6af96ee..1e66b18 100644
 --- a/arch/x86/kernel/pci-swiotlb.c