2.6.7 fix

4 files changed, 61 insertions, 27 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 7c265260f981..e3ce5dc41a85 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.35 2004/05/02 19:58:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.36 2004/05/27 15:27:32 lu_zero Exp $
+
+  27 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6-get-page.patch, ati-drivers-3.7.6-r1.ebuild:
+  Fix for 2.6.7 kernel
 
   02 May 2004; Donnie Berkholz <spyderous@gentoo.org>;
   ati-drivers-3.7.6-r1.ebuild:
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 591249537413..5b5ff165f701 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,35 +1,36 @@
-MD5 e46d9ee9a5c8759929b317d82475adbd ChangeLog 6201
-MD5 502c5f8d88bef36069b0e109d7f8d476 ati-drivers-3.7.6-r1.ebuild 4096
-MD5 22c122828949dd70cfba9c907c963a24 ati-drivers-2.9.12.ebuild 3637
-MD5 b9968b48394626dfa20195e9d9f0f459 ati-drivers-2.9.13-r1.ebuild 4274
-MD5 724de9fcad99611bdd1a3aed20c5e7e1 ati-drivers-2.9.13.ebuild 3638
-MD5 23557d21274dc6044af2671f6f392128 ati-drivers-3.2.0.ebuild 4522
-MD5 beffc642f12ec1b5c076542713d7de04 ati-drivers-3.2.4.ebuild 4713
-MD5 d87eb946ff3b147dc4d2e679c489c6cf ati-drivers-3.2.5.ebuild 4583
+MD5 1397fa0cb35fcb96a3befa9c282d384d ati-drivers-3.2.0.ebuild 4521
+MD5 ee68f54d4c74d5662eaadd541a53af59 ati-drivers-3.7.0.ebuild 5452
+MD5 6992bdc29ee7b887a009c0b585996df1 ChangeLog 6335
+MD5 3dc1266cde9024db50801253bc1502fb ati-drivers-3.2.5.ebuild 4582
 MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
-MD5 ed576c52644a0f51ffd1da476cca417e ati-drivers-3.2.5-r1.ebuild 4607
-MD5 e990b3a94fb5f7001f792c145227fdc7 ati-drivers-3.2.8.ebuild 4589
-MD5 75eac6931b98247a5139c4bad8cc52a5 ati-drivers-3.7.0.ebuild 5453
-MD5 bdeb8f920ed62f6b292633b575cc725c ati-drivers-3.2.8-r1.ebuild 3674
-MD5 c85b9fd4c5e51b20cf57017fb38e835e ati-drivers-3.7.6.ebuild 3676
+MD5 0b7bfbabdfaa2b103e1db8a6f0379845 ati-drivers-2.9.12.ebuild 3636
+MD5 4a894069620e67130a64db93d2b55ae9 ati-drivers-3.2.8-r1.ebuild 3673
+MD5 1cf90e6829b02297dc9e8399ab7dcd3f ati-drivers-3.7.6.ebuild 3675
+MD5 75eeb8bca44444785483581577a5a23a ati-drivers-3.7.6-r1.ebuild 4139
+MD5 ca8285329fa786207d8b3cfa78d63fd7 ati-drivers-3.2.8.ebuild 4588
+MD5 354f5d998433c1b4f9a95441f58299b2 ati-drivers-3.2.5-r1.ebuild 4606
+MD5 0a4641949ac4bbcca5bf6cdb30772446 ati-drivers-3.2.4.ebuild 4712
+MD5 e51a9be1f465d0de93d358f87b0ae3cb ati-drivers-2.9.13.ebuild 3637
+MD5 13a32d6b01ead543e27e71e6c0f7549f ati-drivers-2.9.13-r1.ebuild 4273
+MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
+MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
+MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
+MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
+MD5 a2a4f4788a7de4a9c7c0295a2804752f files/digest-ati-drivers-3.7.0 78
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-3.7.6-r1 72
-MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
-MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
 MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
 MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
-MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
+MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
 MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
-MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
-MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
-MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
 MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
+MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
-MD5 a2a4f4788a7de4a9c7c0295a2804752f files/digest-ati-drivers-3.7.0 78
-MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
 MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r1 78
+MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
 MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-3.7.6 72
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
+MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
diff --git a/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild b/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild
index 4f0c4485f8ca..4dbe16bf789d 100644
--- a/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild,v 1.4 2004/05/02 19:58:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild,v 1.5 2004/05/27 15:27:32 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
@@ -53,6 +53,7 @@ src_unpack() {
 	if [ "`echo ${KV}|grep 2.6`" ]
 	then
 		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
+		epatch ${FILESDIR}/fglrx-2.6-get-page.patch
 	fi
 }
 
diff --git a/media-video/ati-drivers/files/fglrx-2.6-get-page.patch b/media-video/ati-drivers/files/fglrx-2.6-get-page.patch
new file mode 100644
index 000000000000..3bcaca0e2a91
--- /dev/null
+++ b/media-video/ati-drivers/files/fglrx-2.6-get-page.patch
@@ -0,0 +1,28 @@
+diff -ruN lib.orig/modules/fglrx/build_mod/agpgart_be.c lib/modules/fglrx/build_mod/agpgart_be.c
+--- lib.orig/modules/fglrx/build_mod/agpgart_be.c	2004-03-04 18:25:44.000000000 +0100
++++ lib/modules/fglrx/build_mod/agpgart_be.c	2004-05-27 16:10:56.874535000 +0200
+@@ -1402,7 +1402,8 @@
+     }
+ #endif
+ 
+-    atomic_inc(&page->count);
++    //atomic_inc(&page->count);
++    get_page(page);
+     set_bit(PG_locked, &page->flags);
+     atomic_inc(&agp_bridge.current_memory_agp);
+ 
+diff -ruN lib.orig/modules/fglrx/build_mod/firegl_public.c lib/modules/fglrx/build_mod/firegl_public.c
+--- lib.orig/modules/fglrx/build_mod/firegl_public.c	2004-05-27 16:24:10.879828208 +0200
++++ lib/modules/fglrx/build_mod/firegl_public.c	2004-05-27 16:11:33.393983000 +0200
+@@ -2059,8 +2059,8 @@
+     pMmPage = virt_to_page(kaddr);
+ #endif /* LINUX_VERSION_CODE < 0x020400 */
+ 
+-    atomic_inc(&(pMmPage->count));  /* inc usage count of page */
+-
++//    atomic_inc(&(pMmPage->count));  /* inc usage count of page */
++    get_page(pMmPage);
+ #if LINUX_VERSION_CODE >= 0x020400
+   //  __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n",
+     //    address, page_address(pMmPage));
+