# ChangeLog for media-video/ati-drivers
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.56 2004/12/27 14:11:20 lu_zero Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.57 2005/01/08 08:26:11 lu_zero Exp $
+
+ 08 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+ +files/8.08-kernel-2.6.10.patch:
+ Adding the official patch
27 Dec 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.6.ebuild:
Marked x86
-MD5 55084b4637f59dbc056f3c3ea6ac9ef7 ati-drivers-3.2.0.ebuild 4494
-MD5 c097444035f82c48673393e171163f90 ati-drivers-3.7.0.ebuild 5424
-MD5 3a4aabaec1f8705a6e83b19b88ae8e60 ati-drivers-3.12.0.ebuild 4860
-MD5 c93bcb96712223aa9fb8b71953b8a470 ati-drivers-3.14.6.ebuild 4523
-MD5 1446abce76c8304f3b1fefa10c5d98bc ChangeLog 9696
-MD5 616152ceacf4338e4dfc14b378413e47 ati-drivers-3.2.5.ebuild 4555
+MD5 8d860fbf33adbd08bbd1221321c4dc34 ati-drivers-3.2.0.ebuild 4492
+MD5 3d6215b0775910bd3982fe8a7453718c ati-drivers-3.7.0.ebuild 5422
+MD5 2ace02f46d6c58b2d2031932f81af225 ati-drivers-3.12.0.ebuild 4860
+MD5 7d92c5a2ea96597e36804d1de46c831d ati-drivers-3.14.6.ebuild 4523
+MD5 846734c1a1f0e521eba644d5db0a039c ChangeLog 9809
+MD5 0dd1b578227ecbfb9b6e29c0a2eafc3f ati-drivers-3.2.5.ebuild 4553
MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
-MD5 d404832f9f2ff434a19c278fdec0bb2e ati-drivers-3.2.8-r2.ebuild 4134
-MD5 79a710a6e52148ad84f5a74e5f0e4428 ati-drivers-2.9.12.ebuild 3601
-MD5 145669c711afe44523917df1fc33bcdf ati-drivers-3.2.8-r1.ebuild 3662
-MD5 9dd2c8e40a7f834a2df7d7d4d9963e7f ati-drivers-3.7.6.ebuild 3662
-MD5 f99248507f1c16729893906827ccc545 ati-drivers-3.7.6-r1.ebuild 4128
-MD5 1ec180441a38b1d56f59394a1cb4842a ati-drivers-3.9.0.ebuild 4125
-MD5 a2e898dd45c93552faf9522eb9ee6f85 ati-drivers-3.2.8.ebuild 4561
-MD5 003cc1469c56626052124a10a92b55ea ati-drivers-3.11.1.ebuild 4772
-MD5 9d6164f9cb443fb2fceadee69ec62d0e ati-drivers-3.2.5-r1.ebuild 4580
-MD5 6b5ab1abb7122e2335aeef6de0db7aca ati-drivers-3.2.4.ebuild 4685
-MD5 74ef32c7ac7c7f3a15de7faa50124998 ati-drivers-3.14.1.ebuild 4346
-MD5 22470cac4821c26539336042f88281f3 ati-drivers-3.9.0-r1.ebuild 4513
-MD5 8eb6d0fd20fa26cd240efd44a74d7e41 ati-drivers-2.9.13.ebuild 3602
-MD5 7427ff67a7d53009779660017e6a35b6 ati-drivers-2.9.13-r1.ebuild 4246
+MD5 81e17646f0356531565c36e3881cf5ec ati-drivers-3.2.8-r2.ebuild 4132
+MD5 8c0875cca739f44343d480f6eac650ec ati-drivers-2.9.12.ebuild 3600
+MD5 247f9558569f974b161db3d432aaa340 ati-drivers-3.2.8-r1.ebuild 3660
+MD5 b15d3859f4f32a171544f80542f74dbf ati-drivers-3.7.6.ebuild 3660
+MD5 67ed4ee01ed4d7e9c6fd64f859137b7c ati-drivers-3.7.6-r1.ebuild 4127
+MD5 897d558fbabf5f0fb60c833a326eea6b ati-drivers-3.9.0.ebuild 4123
+MD5 e1c79c4d9777c0d98423f1bc13bc6aa8 ati-drivers-3.2.8.ebuild 4560
+MD5 375a467b7a4e36edf6514421f8f64694 ati-drivers-3.11.1.ebuild 4772
+MD5 c78a664b2a22a76a3e18601f4f8a71aa ati-drivers-3.2.5-r1.ebuild 4578
+MD5 f2944e697a699208207156583a087b1e ati-drivers-3.2.4.ebuild 4684
+MD5 a6f870cc41fb1a75a94e93539a8b8ff4 ati-drivers-3.14.1.ebuild 4346
+MD5 d73ae47566be08fd04b3c11deba4261c ati-drivers-3.9.0-r1.ebuild 4511
+MD5 fc9ff3c432c835b8828cfe9d2d101279 ati-drivers-2.9.13.ebuild 3601
+MD5 140d666bc8578efd8d98040050dd6688 ati-drivers-2.9.13-r1.ebuild 4244
MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-3.11.1 73
MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-3.14.1 73
MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
+MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492
MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-3.12.0 73
MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.12.ebuild,v 1.8 2004/07/14 21:22:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.12.ebuild,v 1.9 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild,v 1.8 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild,v 1.9 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.13.ebuild,v 1.7 2004/07/14 21:22:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.13.ebuild,v 1.8 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.11.1.ebuild,v 1.3 2004/09/10 23:17:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.11.1.ebuild,v 1.4 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.12.0.ebuild,v 1.4 2004/09/23 22:51:09 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.12.0.ebuild,v 1.5 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.14.1.ebuild,v 1.3 2004/10/07 23:00:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.14.1.ebuild,v 1.4 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.14.6.ebuild,v 1.3 2004/12/27 14:11:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.14.6.ebuild,v 1.4 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.0.ebuild,v 1.8 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.0.ebuild,v 1.9 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.4.ebuild,v 1.9 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.4.ebuild,v 1.10 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild,v 1.11 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild,v 1.12 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5.ebuild,v 1.15 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.5.ebuild,v 1.16 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.8-r1.ebuild,v 1.5 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.8-r1.ebuild,v 1.6 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild,v 1.5 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild,v 1.6 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.8.ebuild,v 1.9 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.8.ebuild,v 1.10 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.7.0.ebuild,v 1.7 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.7.0.ebuild,v 1.8 2005/01/08 08:26:11 lu_zero Exp $
IUSE="qt"
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# 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.9 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild,v 1.10 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# 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.ebuild,v 1.7 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.7.6.ebuild,v 1.8 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.9.0-r1.ebuild,v 1.6 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.9.0-r1.ebuild,v 1.7 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.9.0.ebuild,v 1.5 2004/07/26 20:34:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.9.0.ebuild,v 1.6 2005/01/08 08:26:11 lu_zero Exp $
IUSE=""
--- /dev/null
+--- agpgart_be.c 2005-01-06 9:05:02.000000000 +0100
++++ agpgart_be.c 2005-01-06 9:19:16.000000000 +0100
+
+@@ -255,6 +255,12 @@
+ }
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++#define firegl_pci_find_class(class,from) pci_get_class(class,from)
++#else
++#define firegl_pci_find_class(class,from) pci_find_class(class,from)
++#endif
++
+ int agp_backend_acquire(void)
+ {
+ if (agp_bridge.type == NOT_SUPPORTED) {
+@@ -718,7 +724,7 @@
+ * AGP devices and collect their data.
+ */
+
+- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
++ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
+ device)) != NULL) {
+ pci_read_config_dword(device, 0x04, &scratch);
+
+@@ -794,6 +800,13 @@
+ command &= ~0x00000001;
+ }
+ }
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++ // the reference count has been increased in agp_backend_initialize.
++ if (device)
++ pci_dev_put(device);
++#endif
++
+ /*
+ * PASS2: Figure out the 4X/2X/1X setting and enable the
+ * target (our motherboard chipset).
+@@ -839,8 +852,9 @@
+ * command registers.
+ */
+
+- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
++ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
+ device)) != NULL) {
++
+ pci_read_config_dword(device, 0x04, &scratch);
+
+ if (!(scratch & 0x00100000))
+@@ -871,6 +885,12 @@
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++ // the reference count has been increased in agp_backend_initialize.
++ if (device)
++ pci_dev_put(device);
++#endif
++
+ return 0; /* success */
+ }
+
+@@ -5119,8 +5139,9 @@
+ * AGP devices and collect their data.
+ */
+
+- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
++ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
+ device)) != NULL) {
++
+ pci_read_config_dword(device, 0x04, &scratch);
+
+ if (!(scratch & 0x00100000))
+@@ -5187,6 +5208,13 @@
+ command &= ~0x00000001;
+ }
+ }
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++ // the reference count has been increased in agp_backend_initialize.
++ if (device)
++ pci_dev_put(device);
++#endif
++
+ /*
+ * PASS2: Figure out the 4X/2X/1X setting and enable the
+ * target (our motherboard chipset).
+@@ -5217,8 +5245,9 @@
+ * command registers.
+ */
+
+- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
++ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8,
+ device)) != NULL) {
++
+ pci_read_config_dword(device, 0x04, &scratch);
+
+ if (!(scratch & 0x00100000))
+@@ -5249,6 +5278,12 @@
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++ // the reference count has been increased in agp_backend_initialize.
++ if (device)
++ pci_dev_put(device);
++#endif
++
+ return(0); /* success */
+ }
+
+@@ -6494,10 +6529,10 @@
+ // locate host bridge device
+ #ifdef __x86_64__
+ do {
+- dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev);
++ dev = firegl_pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev);
+ } while((dev) && !agp_check_supported_device(dev));
+ #else
+- if ((dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, NULL)) == NULL)
++ if ((dev = firegl_pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, NULL)) == NULL)
+ return -ENODEV;
+ #endif
+
+@@ -7040,8 +7075,12 @@
+ &agp_bridge.mode);
+ return hp_zx1_setup(dev);
+ }
+- dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev);
++ dev = firegl_pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev);
+ } while (dev);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++ if(dev) pci_dev_put(dev);
++#endif
+ return -ENODEV;
+ }
+ #endif /* __ia64__ */
+@@ -7462,6 +7501,11 @@
+ agp_bridge.free_gatt_table();
+ vfree(agp_bridge.key_list);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
++ // decrease the reference count.
++ pci_dev_put(agp_bridge.dev);
++#endif
++
+ if (agp_bridge.needs_scratch_page == TRUE) {
+ agp_bridge.scratch_page &= ~(0x00000fff);
+ agp_bridge.agp_destroy_page((unsigned long)
+
+
+--- firegl_public.c 2005-01-06 9:05:02.000000000 +0100
++++ firegl_public.c 2005-01-06 9:19:16.000000000 +0100
+@@ -88,6 +88,7 @@
+ #include <linux/smp_lock.h>
+ // newer SuSE kernels need this
+ #include <linux/highmem.h>
++#include <linux/pagemap.h> // for lock_page and unlock_page
+
+ #if defined(__ia64__)
+ #include <linux/vmalloc.h>
projects / gentoo.git / commitdiff