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

[Michael Gilbert]

Author: mgilbert
Date: 2014-01-07 00:56:17 +0000 (Tue, 07 Jan 2014)
New Revision: 1329

Added:
   fglrx-driver/trunk/debian/fglrx-control.manpages
   fglrx-driver/trunk/debian/patches/10-iommu.patch
Removed:
   fglrx-driver/trunk/debian/patches/10-linux3.11.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/patches/series
Log:
release 13.12-3

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-01-04 21:50:21 UTC (rev 1328)
+++ fglrx-driver/trunk/debian/changelog	2014-01-07 00:56:17 UTC (rev 1329)
@@ -1,3 +1,10 @@
+fglrx-driver (1:13.12-3) unstable; urgency=medium
+
+  * Fix IOMMU checks (closes: #729765).
+  * Remove transitional libgl1-fglrx-glx-i386 package.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 05 Jan 2014 14:12:53 +0000
+
 fglrx-driver (1:13.12-2) unstable; urgency=medium
 
   * Add a manpage for atigetsysteminfo.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2014-01-04 21:50:21 UTC (rev 1328)
+++ fglrx-driver/trunk/debian/control	2014-01-07 00:56:17 UTC (rev 1329)
@@ -36,13 +36,12 @@
  lib${fglrx} (= ${binary:Version}),
  ${fglrx:XorgDepends},
  xserver-xorg-core,
+ libgl1-${fglrx}-glx (= ${binary:Version}),
  glx-alternative-fglrx (>= 0.4.1~),
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
  ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
- libgl1-${fglrx}-glx (= ${binary:Version}),
- libgl1-${fglrx}-glx-i386 [amd64],
  ${fglrx}-atieventsd,
 Suggests:
  ${fglrx}-control,
@@ -53,9 +52,6 @@
  xserver-xorg-video-fglrx,
 Conflicts:
  xserver-xorg-video-fglrx,
-Breaks:
- libgl1-${fglrx}-glx (<< ${binary:Version}),
- libgl1-${fglrx}-glx (>> ${binary:Version}),
 Replaces:
  xserver-xorg-video-fglrx,
 Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
@@ -182,19 +178,6 @@
  .
  This package provides the proprietary libGL shipped by ATI/AMD.
 
-#Package: libgl1-${fglrx}-glx-i386
-Package: libgl1-fglrx-glx-i386
-Architecture: i386
-Multi-Arch: foreign
-Depends:
- libgl1-${fglrx}-glx,
- ${shlibs:Depends},
- ${misc:Depends}
-Description: ATI/AMD binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
- This metapackage helps the automatic installation of the 32-bit ATI/AMD
- OpenGL libraries when installing libgl1-${fglrx}-glx
- on amd64 with foreign architecture i386 enabled.
-
 # ${fglrx}-modules-dkms
 Package: fglrx-modules-dkms
 Section: non-free/kernel

Added: fglrx-driver/trunk/debian/fglrx-control.manpages
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.manpages	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-control.manpages	2014-01-07 00:56:17 UTC (rev 1329)
@@ -0,0 +1,2 @@
+debian/amdcccle.1
+debian/atigetsysteminfo.1

Added: fglrx-driver/trunk/debian/patches/10-iommu.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/10-iommu.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/10-iommu.patch	2014-01-07 00:56:17 UTC (rev 1329)
@@ -0,0 +1,31 @@
+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;
+ }
+ 

Deleted: fglrx-driver/trunk/debian/patches/10-linux3.11.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/10-linux3.11.patch	2014-01-04 21:50:21 UTC (rev 1328)
+++ fglrx-driver/trunk/debian/patches/10-linux3.11.patch	2014-01-07 00:56:17 UTC (rev 1329)
@@ -1,14 +0,0 @@
-description: support linux 3.11 kernel
-origin: arch linux fglrx package
-
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-01-04 19:25:36.073332157 +0000
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-01-04 19:25:36.053332157 +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
- 

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2014-01-04 21:50:21 UTC (rev 1328)
+++ fglrx-driver/trunk/debian/patches/series	2014-01-07 00:56:17 UTC (rev 1329)
@@ -4,4 +4,4 @@
 07-linux3.9.patch
 08-linux3.12.patch
 09-linux3.13.patch
-10-linux3.11.patch
+10-iommu.patch