[Pkg-fglrx-devel] r1564 - in fglrx-driver/branches/15.9-jessie/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2016-01-15 22:12:44 +0000 (Fri, 15 Jan 2016)
New Revision: 1564

Removed:
   fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch
   fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch
Modified:
   fglrx-driver/branches/15.9-jessie/debian/changelog
   fglrx-driver/branches/15.9-jessie/debian/patches/series
   fglrx-driver/branches/15.9-jessie/debian/rules.defs
Log:
revert Linux 4.3/4.4 patches, module does not seem to work correctly

Modified: fglrx-driver/branches/15.9-jessie/debian/changelog
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/changelog	2016-01-15 20:50:07 UTC (rev 1563)
+++ fglrx-driver/branches/15.9-jessie/debian/changelog	2016-01-15 22:12:44 UTC (rev 1564)
@@ -3,6 +3,8 @@
   * Rebuild for jessie.
   * Reinstate the libxvbaw-dev package.
   * Remove Conflicts/Replaces: xvba-va-driver.
+  * Revert patches 12-4.3.0-build and 13-4.4.0-build, the patched kernel
+    module does not work on Linux 4.3. (See #809638 for details.)
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 02 Nov 2015 00:30:06 +0100
 

Deleted: fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch	2016-01-15 20:50:07 UTC (rev 1563)
+++ fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch	2016-01-15 22:12:44 UTC (rev 1564)
@@ -1,45 +0,0 @@
-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 */

Deleted: fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch	2016-01-15 20:50:07 UTC (rev 1563)
+++ fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch	2016-01-15 22:12:44 UTC (rev 1564)
@@ -1,18 +0,0 @@
-From: Alberto Milone <alberto.milone at canonical.com>
-Date: Wed, 13 Jan 2016 12:31:04 +0100
-Subject: [PATCH 1/1] Add support for Linux 4.4
-
-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	2016-01-14 09:56:13.000000000 +0100
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2016-01-14 09:57:50.200757457 +0100
-@@ -209,6 +209,10 @@
- #include "kcl_io.h"
- #include "kcl_debug.h"
- 
-+#ifndef XSTATE_FP
-+#define XSTATE_FP XFEATURE_MASK_FP
-+#endif
-+
- // ============================================================
- 
- // VM_SHM is deleted in 2.6.18 or higher kernels.

Modified: fglrx-driver/branches/15.9-jessie/debian/patches/series
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/patches/series	2016-01-15 20:50:07 UTC (rev 1563)
+++ fglrx-driver/branches/15.9-jessie/debian/patches/series	2016-01-15 22:12:44 UTC (rev 1564)
@@ -9,5 +9,3 @@
 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
-13-4.4.0-build.patch

Modified: fglrx-driver/branches/15.9-jessie/debian/rules.defs
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/rules.defs	2016-01-15 20:50:07 UTC (rev 1563)
+++ fglrx-driver/branches/15.9-jessie/debian/rules.defs	2016-01-15 22:12:44 UTC (rev 1564)
@@ -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.4
+LINUX_KMOD_TESTED	 = 4.2
 
 #INSTALLER_PREFIX	 = amd-driver-installer-catalyst
 INSTALLER_PREFIX.zip	 = amd-catalyst-omega