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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-12-31 10:16:57 +0000 (Thu, 31 Dec 2015)
New Revision: 1549

Added:
   fglrx-driver/trunk/debian/patches/12-4.3.0-build.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
   fglrx-driver/trunk/debian/rules.defs
Log:
* Add Ubuntu patch 12-4.3.0-build.
  Closes: #807965


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-11-13 14:01:53 UTC (rev 1548)
+++ fglrx-driver/trunk/debian/changelog	2015-12-31 10:16:57 UTC (rev 1549)
@@ -1,11 +1,16 @@
-fglrx-driver (1:15.9-3) UNRELEASED; urgency=medium
+fglrx-driver (1:15.9-3) UNRELEASED; urgency=high
 
+  [ Andreas Beckmann ]
   * d/rules: Move tar option --no-recursion before the list of files.
   * fglrx-atieventsd.init: Fix 'stop' and implement 'status', thanks to
     D. Leggett.  (Closes: #803494)
   * Reinstate breaks between fglrx-driver and libgl1-fglrx-glx.
   * Update lintian overrides.
 
+  [ Patrick Matthäi ]
+  * Add Ubuntu patch 12-4.3.0-build.
+    Closes: #807965
+
  -- Andreas Beckmann <anbe at debian.org>  Sat, 17 Oct 2015 18:25:41 +0200
 
 fglrx-driver (1:15.9-2) unstable; urgency=medium

Added: fglrx-driver/trunk/debian/patches/12-4.3.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/12-4.3.0-build.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/12-4.3.0-build.patch	2015-12-31 10:16:57 UTC (rev 1549)
@@ -0,0 +1,45 @@
+From 62071ebe1c86ff439ed0bc4b6bdd4f6f9f2737fa Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone at canonical.com>
+Date: Mon, 16 Nov 2015 11:34:16 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.3
+
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-12-31 11:12:34.000000000 +0100
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-12-31 11:14:25.485800244 +0100
+@@ -636,7 +636,11 @@
+ 
+     len = snprintf(buf, request, "%d\n", major);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+     len = seq_printf(m, "%d\n", major);
++#else
++    seq_printf(m, "%d\n", major);
++#endif
+ #endif
+ 
+     KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
+@@ -3440,7 +3444,11 @@
+ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size)
+ {
+ #ifdef CONFIG_MTRR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+     return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
++#else
++    return arch_phys_wc_add(base, size);
++#endif
+ #else /* !CONFIG_MTRR */
+     return -EPERM;
+ #endif /* !CONFIG_MTRR */
+@@ -3449,7 +3457,12 @@
+ int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size)
+ {
+ #ifdef CONFIG_MTRR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+     return mtrr_del(reg, base, size);
++#else
++    arch_phys_wc_del(reg);
++    return reg;
++#endif
+ #else /* !CONFIG_MTRR */
+     return -EPERM;
+ #endif /* !CONFIG_MTRR */

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2015-11-13 14:01:53 UTC (rev 1548)
+++ fglrx-driver/trunk/debian/patches/series	2015-12-31 10:16:57 UTC (rev 1549)
@@ -8,3 +8,4 @@
 09-4.2.0-build.fpregs_active.patch
 10-4.2.0-build.copy_xregs_to_kernel.patch
 11-4.1.0-gpl-only.patch
+12-4.3.0-build.patch

Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	2015-11-13 14:01:53 UTC (rev 1548)
+++ fglrx-driver/trunk/debian/rules.defs	2015-12-31 10:16:57 UTC (rev 1549)
@@ -2,7 +2,7 @@
 SIGNATURE_VERSION	 = 15.9
 XORG_ABI_LIST		 = 19 18 15 14 13 12 11 10 8 6.0
 
-LINUX_KMOD_TESTED	 = 4.2
+LINUX_KMOD_TESTED	 = 4.3
 
 #INSTALLER_PREFIX	 = amd-driver-installer-catalyst
 INSTALLER_PREFIX.zip	 = amd-catalyst-omega