summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/ati-drivers')
-rw-r--r--x11-drivers/ati-drivers/ChangeLog8
-rw-r--r--x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch41
-rw-r--r--x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch90
-rw-r--r--x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch42
-rw-r--r--x11-drivers/ati-drivers/files/atieventsd.rc622
5 files changed, 7 insertions, 196 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index a7974b2a52a7..218162461673 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-drivers/ati-drivers
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.203 2009/11/23 00:06:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.204 2009/12/02 09:35:23 scarabeus Exp $
+
+ 02 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/8.40.4/ati-drivers-2.6.23.patch,
+ -files/8.452/ati-powermode-opt-path-2.patch,
+ -files/8.40.4/ati-drivers-8.40.4-warnings.patch, -files/atieventsd.rc6:
+ Drop unused patches.
23 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> -files/09ati,
-files/ati-drivers-2.6.20.patch,
diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch
deleted file mode 100644
index 97132089fe48..000000000000
--- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 14:24:11.000000000 +0200
-@@ -2409,7 +2409,11 @@
- #ifdef pte_offset_map
- pte_p = pte_offset_map(pmd_p, virtual_addr);
- if (pte_present(*pte_p))
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
-+#else
-+ return 0;
-+#endif
- else
- __KE_DEBUG("page not exists!\n");
- pte_unmap(pte_p);
-@@ -3399,9 +3403,11 @@
- sprintf(buf, "0x%Lx %c%c%c%c%c%c\n",
- *phys_address,
- pte_present (pte) ? 'p' : '-',
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
- pte_read (pte) ? 'r' : '-',
-- pte_write (pte) ? 'w' : '-',
- pte_exec (pte) ? 'x' : '-',
-+#endif
-+ pte_write (pte) ? 'w' : '-',
- pte_dirty (pte) ? 'd' : '-',
- pte_young (pte) ? 'a' : '-');
- }
-@@ -5348,7 +5354,11 @@
- DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
-
- if ((slabcache_obj->cache =
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
- kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
-+#else
-+ kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL)))
-+#endif
- {
- ret = 1;
- }
-
diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch
deleted file mode 100644
index 378435d30bdd..000000000000
--- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 14:24:11.000000000 +0200
-@@ -452,7 +452,7 @@
- }
-
- static unsigned int
--firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt)
-+firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt)
- {
- if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt))
- {
-@@ -1491,7 +1491,8 @@
- int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst)
- {
- void *temp = src;
-- return put_user(temp, dst);
-+ void *dst_temp = dst;
-+ return put_user(temp, dst_temp);
- }
-
- int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst)
-@@ -1883,7 +1884,7 @@
-
- __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from)
- {
-- return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from );
-+ return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from);
- }
-
- void* ATI_API_CALL __ke_malloc(__ke_size_t size)
-@@ -2813,9 +2814,9 @@
- #else
- static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */
-
--static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs)
-+static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1)
- {
-- irq_handler_func(irq, arg1, regs);
-+ irq_handler_func(irq, arg1, NULL);
- return IRQ_HANDLED;
- }
-
-@@ -2826,7 +2827,7 @@
- irq_handler_func = handler;
- return request_irq(irq,
- ke_irq_handler_wrap,
-- SA_SHIRQ, dev_name, dev_id);
-+ IRQF_SHARED, dev_name, dev_id);
- }
-
- void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id)
-@@ -2848,9 +2849,7 @@
-
- void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd)
- {
--#ifdef FIREGL_IOCTL_COMPAT
-- return 0;
--#else
-+#ifndef FIREGL_IOCTL_COMPAT
- unregister_ioctl32_conversion(cmd);
- #endif
- }
-@@ -4353,7 +4352,7 @@
- void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call)
- {
- #ifdef CONFIG_SMP
-- smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 );
-+ smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 );
- #endif
- }
-
-@@ -5303,7 +5302,7 @@
- /** \brief Type definition of the structure describing Slab Cache object */
- typedef struct tag_kasSlabCache_t
- {
-- kmem_cache_t* cache; /* OS slab cache object */
-+ struct kmem_cache* cache; /* OS slab cache object */
- spinlock_t lock; /* OS spinlock object protecting the cache */
- unsigned int routine_type; /* Type of routine the cache might be accessed from */
- char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */
-@@ -5344,7 +5343,7 @@
-
- slabcache_obj->routine_type = access_type;
- spin_lock_init(&(slabcache_obj->lock));
-- sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj);
-+ sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj);
-
- DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
-
diff --git a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
-
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
- user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
- if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
-
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
- echo "Has PPLIB"
- has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
- echo "Low power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=1"
- fi
- else
- echo "high power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
- fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6
deleted file mode 100644
index 2180e0eb13bc..000000000000
--- a/x11-drivers/ati-drivers/files/atieventsd.rc6
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.2 2006/08/04 12:20:19 chrb Exp $
-
-depend() {
- need acpid
-}
-
-start() {
- start-stop-daemon --start --pidfile /var/run/atieventsd.pid \
- --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS}
- local pid=`pidof atieventsd`
- echo $pid > /var/run/atieventsd.pid
- eend $?
-}
-
-stop() {
- start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid
- eend $?
-}
-