Import 2.6.39 patch and Enrico Tagliavini's ebuild from the x11 overlay, bug #368081.

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

4 files changed, 113 insertions, 6 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index f20087c26c0b..b6fc316e5761 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.250 2011/05/17 15:27:37 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.251 2011/05/26 20:17:09 chithanh Exp $
+
+  26 May 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/ati-drivers-2.6.39.patch, ati-drivers-11.5.ebuild:
+  Import 2.6.39 patch and Enrico Tagliavini's ebuild from the x11 overlay, bug
+  #368081.
 
 *ati-drivers-11.5 (17 May 2011)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 67e305a40e6b..bb37749862a4 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,6 +1,7 @@
 AUX ati-drivers-2.6.36.patch 876 RMD160 955b55c92a3b0a75b205c4563bc00d312298e72e SHA1 ab5234057cbd88ae5ff346e62a8a9f511d4cc2aa SHA256 00ffca26787d4c2cab6848cf0bec043e6c099c60738aebacb2148e920738fcb6
 AUX ati-drivers-2.6.37.patch 495 RMD160 2e1b3e6f2ebcd52b5e0584793956a3c24bca7dac SHA1 80ed7b03dd87fdf750a7124c7e392d124e3ba90f SHA256 acce741df8842178c54db4a01ed68a9dd54c331b0d6c153ecaf4f088cf0f18a2
 AUX ati-drivers-2.6.38.patch 1645 RMD160 f91dc5e16c89e942cca63252e186b5d97d7db1c7 SHA1 f17a853df364b0942116c7fafe8372e483c1542f SHA256 46ae66c3985ce3af21e36d3bd71019a6b81e2884099253e2772384bd67a77c24
+AUX ati-drivers-2.6.39.patch 3909 RMD160 5360585cfc3e30babcfee55598883d78120b913f SHA1 51f60012d03a42bff6ed703b0e29bc3ba07a0c63 SHA256 2cf957a44ae46d5b487b0eef7d303ca5b503064d51e5bdf1a781e2a792909cd5
 AUX ati-drivers-fix_compilation-bug-297322.patch 1114 RMD160 69d27b8e3b45f254d3ed71c47b6b28621868af91 SHA1 d51ca6418e9644035727eb63cbe0494111c9e9b2 SHA256 edbfc56eec848389c3dfdd94362322de41027b9813128d2d4f8e476d1d8581e3
 AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
@@ -17,6 +18,6 @@ EBUILD ati-drivers-10.12.ebuild 19996 RMD160 fe099682e3d10cfabd7c62c7212fb558ebc
 EBUILD ati-drivers-11.2.ebuild 19695 RMD160 678ffdc48256ae2f4f693e4a3e94e43d5696fbf6 SHA1 fe1e5bb42f28aa1c2b0b974da02b34b02c0c20c5 SHA256 1d9dafbe3e18a9b771768139f152d4b3fe02f5f964b7dd74295bfb33b82ead5a
 EBUILD ati-drivers-11.3.ebuild 18366 RMD160 d4f5e62d43d5ac925358dd5826302404b6a0f523 SHA1 d0de565b678e26f7bb94680fbc8032eac008d717 SHA256 25063f69b8b8cce2a44d0b1a4e56933a42b56d0426bc05e595182af3c3f1485d
 EBUILD ati-drivers-11.4.ebuild 17516 RMD160 afeaf85d9cc5db751fe5d556c76c74aaf8804fbd SHA1 b4124f1657fdabf18f56b39587647c445701464a SHA256 d3fccbf62fae93b6a5fe4ed97eba2b69c1bd79b244a9e32cfcbe3cc2f8a641c1
-EBUILD ati-drivers-11.5.ebuild 18195 RMD160 0853d318b1cc0c0fea3d37bbc8c2265c9ed5f67f SHA1 8cd92fa4d6f85995dcaf7a92ca1d040aa3739ad6 SHA256 80d207ab5e1514889cfa221d0a31f61440510048805bbac1f2f5899a07588fe8
-MISC ChangeLog 70351 RMD160 84c83ea95e8912a69f13e60331214ae5920ba630 SHA1 cb31f5a8b4ac9a38043321195630a05805586cdf SHA256 aa223236ec65071440d13f9b9a9112b9f2c6d94eea710ac46871d43c6117c622
+EBUILD ati-drivers-11.5.ebuild 18363 RMD160 a8b18746e5b57db741a58d12689b58d2dc6013c2 SHA1 328d2455f308d3b4908015d548f735f3c368bfac SHA256 80b7f92f2454d04900e5edbddbb93677b05949fe90e529c32477a492791dd3a9
+MISC ChangeLog 70571 RMD160 e70942113ecc6340a85ce47e9ee3b4da643fb1ee SHA1 13b1255ae7618083b9f4b9f0a22e23d83210331b SHA256 e872576178e04fb10f7854cc88651747968dac240f7442f9e22b5705379cc07c
 MISC metadata.xml 570 RMD160 0a020753d41a48670dccdf8da444e29531426bbb SHA1 4b0d5dace7a76499468fe40c9645ef11ff864776 SHA256 e20880954026ec88b69b99b3015edbfcb3bb3067b693064aecf8770a8cf76072
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild
index 6117f6012e2b..9fdbfa0241b2 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild,v 1.1 2011/05/17 15:27:37 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.5.ebuild,v 1.2 2011/05/26 20:17:09 chithanh Exp $
 
 EAPI=4
 
@@ -84,7 +84,7 @@ QA_WX_LOAD="
 QA_PRESTRIPPED="
 	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
 	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
-	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
 	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
 	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
 	usr/lib\(32\|64\)\?/libaticaldd.so
@@ -200,7 +200,7 @@ _check_kernel_config() {
 		failed=1
 	fi
 
-	kernel_is ge 2 6 37 && if ! linux_chkconfig_present BKL ; then
+	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
 		eerror "${P} requires BKL."
 		eerror "Please enable the Big Kernel Lock:"
 		eerror "Kernel hacking  --->"
@@ -293,6 +293,11 @@ src_prepare() {
 	# Fix a known compilation error
 	epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch
 
+	# Experimental 2.6.39 support
+	if kernel_is -ge 2 6 39 ; then
+		epatch "${FILESDIR}"/ati-drivers-2.6.39.patch || die "epatch failed"
+	fi
+
 	# These are the userspace utilities that we also have source for.
 	# We rebuild these later.
 	rm \
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
new file mode 100644
index 000000000000..6f3940ca9b48
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch
@@ -0,0 +1,96 @@
+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);