[Pkg-fglrx-devel] r639 - in fglrx-driver/trunk/debian: . patches
Michael Gilbert
gilbert-guest at alioth.debian.org
Thu Jul 28 03:06:26 UTC 2011
Author: gilbert-guest
Date: 2011-07-28 03:06:26 +0000 (Thu, 28 Jul 2011)
New Revision: 639
Removed:
fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff
fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff
fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides
fglrx-driver/trunk/debian/patches/series
Log:
initial support for 11-7
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-07-23 03:50:11 UTC (rev 638)
+++ fglrx-driver/trunk/debian/changelog 2011-07-28 03:06:26 UTC (rev 639)
@@ -1,10 +1,15 @@
-fglrx-driver (1:11-6-4) UNRELEASED; urgency=low
+fglrx-driver (1:11-7-1) UNRELEASED; urgency=low
+ * New upstream version:
+ - Drop debian/patches/05-fix-global-kernel-lock.diff and
+ debian/patches/06-no-smp-lock.deff (upstream no longer tries to use
+ kernel locking).
+ - Drop 07-2.6.39-support.diff (now supported upstream).
* Use simplified debian/rules format:
- Bump debhelper version to 8.
- Significantly simplify and clean up debian/rules (making it much more
maintainable in my opinion).
- * Clean up get-orig-source rule a bit as well.
+ * Clean up get-orig-source rule a bit.
-- Michael Gilbert <michael.s.gilbert at gmail.com> Tue, 19 Jul 2011 18:23:13 -0400
Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides 2011-07-23 03:50:11 UTC (rev 638)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides 2011-07-28 03:06:26 UTC (rev 639)
@@ -1,5 +1,4 @@
fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-11-6/libfglrx_ip.a aquired acquired
fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-11-6/libfglrx_ip.a neccessary necessary
fglrx-modules-dkms: spelling-error-in-binary usr/src/fglrx-11-6/libfglrx_ip.a neccessary necessary
-fglrx-modules-dkms: unstripped-binary-or-object usr/src/fglrx-11-6/libfglrx_ip.a
fglrx-modules-dkms: no-upstream-changelog
Deleted: fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff 2011-07-23 03:50:11 UTC (rev 638)
+++ fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff 2011-07-28 03:06:26 UTC (rev 639)
@@ -1,24 +0,0 @@
-Description: add support for missing kernel lock
-Author: Pascal Giard <evilynux at gmail.com>
-
-diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-04-27 21:30:08.000000000 +0200
-+++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-04-27 21:29:27.000000000 +0200
-@@ -1902,13 +1902,17 @@
- /** \brief Grab global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelLock(void)
- {
-+#ifdef CONFIG_KERNEL_LOCK
- lock_kernel();
-+#endif
- }
-
- /** \brief Release global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelUnlock(void)
- {
-+#ifdef CONFIG_KERNEL_LOCK
- unlock_kernel();
-+#endif
- }
-
- /*****************************************************************************/
Deleted: fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff 2011-07-23 03:50:11 UTC (rev 638)
+++ fglrx-driver/trunk/debian/patches/06-no-smp-lock.diff 2011-07-28 03:06:26 UTC (rev 639)
@@ -1,39 +0,0 @@
-# Do not include smp_lock.h if the Kernel is built without BKL.
-# Closes: #619952
-
-diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drmP.h fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h
---- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drmP.h 2011-03-24 17:00:28.000000000 +0100
-+++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h 2011-03-29 20:39:05.000000000 +0200
-@@ -57,7 +57,11 @@
- #include <linux/pci.h>
- #include <linux/version.h>
- #include <linux/sched.h>
-+/* with no Big Kernel Lock and linux 2.6.38
-+ and higher smp_lock.h is removed */
-+#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #include <linux/smp_lock.h> /* For (un)lock_kernel */
-+#endif
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #if defined(__alpha__) || defined(__powerpc__)
-diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-29 20:37:04.000000000 +0200
-+++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-29 20:39:05.000000000 +0200
-@@ -116,7 +116,16 @@
- #include <linux/pci.h>
- #include <linux/wait.h>
- #include <linux/miscdevice.h>
--#include <linux/smp_lock.h>
-+
-+/* with no Big Kernel Lock and linux 2.6.38
-+ and higher is smp_lock.h removed.
-+ instead of smp_lock.h is sched.h required */
-+#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
-+#include <linux/smp_lock.h> /* For (un)lock_kernel */
-+#else
-+#include <linux/sched.h>
-+#endif
-+
- // newer SuSE kernels need this
- #include <linux/highmem.h>
-
Deleted: fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff 2011-07-23 03:50:11 UTC (rev 638)
+++ fglrx-driver/trunk/debian/patches/07-2.6.39-support.diff 2011-07-28 03:06:26 UTC (rev 639)
@@ -1,33 +0,0 @@
-Description: Add Linux 2.6.39 support
- <linux/spinlock_types.h> had the following comment until 2.6.38:
- .
- /*
- * SPIN_LOCK_UNLOCKED defeats lockdep state tracking and is hence
- * deprecated.
- * Please use DEFINE_SPINLOCK() or __SPIN_LOCK_UNLOCKED() as
- * appropriate.
- */
- #define SPIN_LOCK_UNLOCKED __SPIN_LOCK_UNLOCKED(old_style_spin_init)
- .
- This definition got removed in 2.6.39. Restore it locally until it gets fixed
- upstream.
-Author: Miguel Colon <debian.micove at gmail.com>
-Forwarded: no
-Last-Update: 2011-03-30
-
-diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-04-27 21:48:43.000000000 +0200
-+++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-04-27 21:49:36.000000000 +0200
-@@ -1060,7 +1060,12 @@
- dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
-
- for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
- dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
-+#else
-+ dev->spinlock[i] = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
-+#endif
-+
-
- for (i=0; i < __KE_MAX_SEMAPHORES; i++)
- sema_init(&dev->struct_sem[i], 1);
Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series 2011-07-23 03:50:11 UTC (rev 638)
+++ fglrx-driver/trunk/debian/patches/series 2011-07-28 03:06:26 UTC (rev 639)
@@ -1,6 +1,3 @@
01-CONFIG_X86_XEN.diff
02-dkms-arch_compat.diff
03-authatieventsd.sh.diff
-05-fix-global-kernel-lock.diff
-06-no-smp-lock.diff
-07-2.6.39-support.diff
More information about the Pkg-fglrx-devel
mailing list