[gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers/files/8.582: ati-powermode-opt-path-2.patch ati-drivers-xen-8.552.patch

[gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers/files/8.582: ati-powermode-opt-path-2.patch ati-drivers-xen-8.552.patch

[Jeffrey Gardner (je_fro)]

je_fro      09/02/26 17:14:48

  Added:                ati-powermode-opt-path-2.patch
                        ati-drivers-xen-8.552.patch
  Log:
  Latest for testing - let the bloodletting begin :)
  (Portage version: 2.1.6.7/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch?rev=1.1&content-type=text/plain

Index: ati-powermode-opt-path-2.patch
===================================================================
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




1.1                  x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch?rev=1.1&content-type=text/plain

Index: ati-drivers-xen-8.552.patch
===================================================================
--- common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:17:27.000000000 +0000
+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-09 15:12:34.000000000 +0000
@@ -31,6 +31,9 @@
 #include <linux/autoconf.h>
 
 #if !defined(CONFIG_X86_PC) 
+#if !defined(CONFIG_X86_PC_XEN)
+#if !defined(CONFIG_X86_XEN)
+#if !defined(CONFIG_X86_64_XEN)
 #if !defined(CONFIG_X86_64)
 #if !defined(CONFIG_X86_VOYAGER)
 #if !defined(CONFIG_X86_NUMAQ)
@@ -47,6 +50,9 @@
 #endif
 #endif
 #endif
+#endif
+#endif
+#endif
 
 /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
  * a static inline function that uses a GPL-only symbol in a header
--- common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:17:27.000000000 +0000
+++ common/lib/modules/fglrx/build_mod/firegl_public.h	2008-12-09 15:15:45.000000000 +0000
@@ -30,9 +30,13 @@
 #endif
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-
+#ifdef CONFIG_XEN
+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
+#else
 #define REMAP_PAGE_RANGE_FN remap_pfn_range
 #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
+#endif
 #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
 
 #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
@@ -43,13 +47,21 @@
 
 #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
 
+#ifdef CONFIG_XEN
+#define REMAP_PAGE_RANGE(vma,offset) \
+    REMAP_PAGE_RANGE_FN((vma), \
+                        (vma)->vm_start,       \
+                        REMAP_PAGE_RANGE_OFF(offset), \
+                        (vma)->vm_end - (vma)->vm_start, \
+                        (vma)->vm_page_prot)
+#else
 #define REMAP_PAGE_RANGE(vma,offset) \
     REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
                         (vma)->vm_start,	\
                         REMAP_PAGE_RANGE_OFF(offset), \
                         (vma)->vm_end - (vma)->vm_start, \
                         (vma)->vm_page_prot)
-
+#endif
 
 /* Page table macros */
 

[gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers/files/8.582: ati-powermode-opt-path-2.patch ati-drivers-xen-8.552.patch

[Tomas Chvatal (scarabeus)]

scarabeus    09/11/23 00:06:19

  Removed:              ati-powermode-opt-path-2.patch
                        ati-drivers-xen-8.552.patch
  Log:
  Drop stale patches.
  (Portage version: 2.2_rc51/cvs/Linux x86_64)