[Pkg-fglrx-devel] r1366 - in fglrx-driver/trunk/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2014-04-23 15:15:50 +0000 (Wed, 23 Apr 2014)
New Revision: 1366

Removed:
   fglrx-driver/trunk/debian/patches/10-iommu.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
drop 10-iommu.patch

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-04-23 15:12:42 UTC (rev 1365)
+++ fglrx-driver/trunk/debian/changelog	2014-04-23 15:15:50 UTC (rev 1366)
@@ -8,6 +8,7 @@
     libgl1-fglrx-glx Breaks: fglrx-driver (<< this) which apt (from wheezy)
     seems to cope much better with, thanks to Simon McVittie
     (Closes: #745622).
+  * 10-iommu.patch: Remove, fixed upstream.
 
  -- Andreas Beckmann <anbe at debian.org>  Wed, 23 Apr 2014 17:02:24 +0200
 

Deleted: fglrx-driver/trunk/debian/patches/10-iommu.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/10-iommu.patch	2014-04-23 15:12:42 UTC (rev 1365)
+++ fglrx-driver/trunk/debian/patches/10-iommu.patch	2014-04-23 15:15:50 UTC (rev 1366)
@@ -1,31 +0,0 @@
-description: iommu support
-origin: arch linux fglrx package
-origin: http://forums.amd.com/game/messageview.cfm?catid=488&threadid=168661
-
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-01-06 23:46:54.302248120 +0000
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-01-06 23:46:54.238248120 +0000
-@@ -93,7 +93,7 @@
-    and they use different config options. These options can only be enabled
-    on x86_64 with newer 2.6 kernels (2.6.23 for intel, 2.6.26 for amd). 
- */
--#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_DMAR)
-+#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_INTEL_IOMMU)
-     #define FIREGL_DMA_REMAPPING
- #endif
- 
---- a/common/lib/modules/fglrx/build_mod/kcl_iommu.c	2014-01-04 19:24:37.457333666 +0000
-+++ b/common/lib/modules/fglrx/build_mod/kcl_iommu.c	2014-01-06 23:48:06.346247943 +0000
-@@ -187,11 +187,13 @@
-  */
- int ATI_API_CALL KCL_IOMMU_CheckInfo( KCL_PCI_DevHandle pcidev)
- {
-+#ifdef IOMMUV2_SUPPORT
-     struct pci_dev* pdev = (struct pci_dev*)pcidev;
-     if ( pdev->dev.archdata.iommu )
-     {
-         return 1;
-     }
-+#endif
-     return 0;
- }
- 

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2014-04-23 15:12:42 UTC (rev 1365)
+++ fglrx-driver/trunk/debian/patches/series	2014-04-23 15:15:50 UTC (rev 1366)
@@ -1,4 +1,3 @@
 02-dkms-arch_compat.patch
 03-authatieventsd.sh.patch
 06-stub-for-agpless-kernel.patch
-10-iommu.patch