diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-06 08:40:26 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-06 08:40:26 +0000 |
commit | fd193b1b3e5a75b383aca01b184eeb59ad1c371d (patch) | |
tree | 2baa9fbce0333948a727c144d48e275b8a92a7e3 /x11-drivers/ati-drivers/files | |
parent | Cleanup the list of available versions as 11.x does not even build with 3.x s... (diff) | |
download | historical-fd193b1b3e5a75b383aca01b184eeb59ad1c371d.tar.gz historical-fd193b1b3e5a75b383aca01b184eeb59ad1c371d.tar.bz2 historical-fd193b1b3e5a75b383aca01b184eeb59ad1c371d.zip |
Also remove unused patches.
Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers/ati-drivers/files')
3 files changed, 0 insertions, 160 deletions
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch deleted file mode 100644 index 6f3940ca9b48..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch +++ /dev/null @@ -1,96 +0,0 @@ -Description: add support for missing kernel lock -Author: Pascal Giard <evilynux@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 - } - - /*****************************************************************************/ -# 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> - -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@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); diff --git a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch b/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch deleted file mode 100644 index e2af915a5d02..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c -+++ common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -1441,7 +1441,9 @@ - todo !!! - #endif - --unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old, -+void __cmpxchg_wrong_size(void) {} -+ -+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old, - unsigned long new, int size) - { - #ifndef __HAVE_ARCH_CMPXCHG ---- common/lib/modules/fglrx/build_mod/firegl_public.h -+++ common/lib/modules/fglrx/build_mod/firegl_public.h -@@ -441,7 +441,8 @@ - extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask); - extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void); - --extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old, -+extern void __cmpxchg_wrong_size(void); -+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old, - unsigned long new, int size); - - #define __ke_cmpxchg(ptr,o,n) \ diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch deleted file mode 100644 index fe5ed2f8ee72..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig 2011-12-30 14:32:00.271391437 +0100 -+++ common/lib/modules/fglrx/build_mod/kcl_debug.h 2011-12-30 15:48:21.647473696 +0100 -@@ -85,8 +85,8 @@ - #ifdef ERROR - #undef ERROR - #endif --#ifdef WARN --#undef WARN -+#ifdef AMD_WARN -+#undef AMD_WARN - #endif - #ifdef INFO - #undef INFO -@@ -122,7 +122,7 @@ - { - SPECIAL = 0, - ERROR , -- WARN , -+ AMD_WARN , - INFO , - INFOEX, - TRACE, -@@ -163,14 +163,14 @@ - { - {SPECIAL , 'S'}, - {ERROR , 'E'}, -- {WARN , 'W'}, -+ {AMD_WARN , 'W'}, - {INFO , 'I'}, - {INFOEX , 'X'}, - {TRACE , 'T'}, - {PERFORMANCE , 'P'}, - {DUMP , 'D'}, - }; --#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) -+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) - #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX))) - static module_map module_type_map[LOG_M_MAX] = - { |