Gentoo Archives: gentoo-commits

From: "Jeffrey Gardner (je_fro)" <je_fro@g.o>
To: gentoo-commits@l.g.o
Subject: [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
Date: Thu, 26 Feb 2009 17:14:51
Message-Id: E1Lcjou-0005be-ES@stork.gentoo.org
1 je_fro 09/02/26 17:14:48
2
3 Added: ati-powermode-opt-path-2.patch
4 ati-drivers-xen-8.552.patch
5 Log:
6 Latest for testing - let the bloodletting begin :)
7 (Portage version: 2.1.6.7/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch
11
12 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
13 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
14
15 Index: ati-powermode-opt-path-2.patch
16 ===================================================================
17 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
18 --- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100
19 +++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100
20 @@ -4,6 +4,8 @@
21 # Control script for ACPI lid state and AC adapter state
22 #
23
24 +aticonfig='/opt/bin/aticonfig'
25 +
26 getXuser() {
27 user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
28 if [ x"$user" = x"" ]; then
29 @@ -47,7 +49,7 @@
30 done
31
32 #If PPLIB is enabled
33 -su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
34 +su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
35 if [ $? = 0 ]; then
36 echo "Has PPLIB"
37 has_pplib=1
38 @@ -61,15 +63,15 @@
39 if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
40 echo "Low power"
41 if [ ${has_pplib} -eq 1 ]; then
42 - su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
43 + su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
44 else
45 - su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
46 + su $user -c "$aticonfig --set-powerstate=1"
47 fi
48 else
49 echo "high power"
50 if [ ${has_pplib} -eq 1 ]; then
51 - su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
52 + su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
53 else
54 - su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
55 + su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
56 fi
57 fi
58
59
60
61
62 1.1 x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch
63
64 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
65 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
66
67 Index: ati-drivers-xen-8.552.patch
68 ===================================================================
69 --- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000
70 +++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000
71 @@ -31,6 +31,9 @@
72 #include <linux/autoconf.h>
73
74 #if !defined(CONFIG_X86_PC)
75 +#if !defined(CONFIG_X86_PC_XEN)
76 +#if !defined(CONFIG_X86_XEN)
77 +#if !defined(CONFIG_X86_64_XEN)
78 #if !defined(CONFIG_X86_64)
79 #if !defined(CONFIG_X86_VOYAGER)
80 #if !defined(CONFIG_X86_NUMAQ)
81 @@ -47,6 +50,9 @@
82 #endif
83 #endif
84 #endif
85 +#endif
86 +#endif
87 +#endif
88
89 /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
90 * a static inline function that uses a GPL-only symbol in a header
91 --- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000
92 +++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000
93 @@ -30,9 +30,13 @@
94 #endif
95
96 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
97 -
98 +#ifdef CONFIG_XEN
99 +#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
100 +#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
101 +#else
102 #define REMAP_PAGE_RANGE_FN remap_pfn_range
103 #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
104 +#endif
105 #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
106
107 #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
108 @@ -43,13 +47,21 @@
109
110 #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
111
112 +#ifdef CONFIG_XEN
113 +#define REMAP_PAGE_RANGE(vma,offset) \
114 + REMAP_PAGE_RANGE_FN((vma), \
115 + (vma)->vm_start, \
116 + REMAP_PAGE_RANGE_OFF(offset), \
117 + (vma)->vm_end - (vma)->vm_start, \
118 + (vma)->vm_page_prot)
119 +#else
120 #define REMAP_PAGE_RANGE(vma,offset) \
121 REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
122 (vma)->vm_start, \
123 REMAP_PAGE_RANGE_OFF(offset), \
124 (vma)->vm_end - (vma)->vm_start, \
125 (vma)->vm_page_prot)
126 -
127 +#endif
128
129 /* Page table macros */