| 1 |
chithanh 11/03/31 20:39:18 |
| 2 |
|
| 3 |
Modified: ati-drivers-2.6.38.patch |
| 4 |
Log: |
| 5 |
Version bump, import of Enrico Tagliavini's ebuild from the x11 overlay. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: ati-drivers-2.6.38.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- ati-drivers-2.6.38.patch 22 Mar 2011 21:33:56 -0000 1.1 |
| 23 |
+++ ati-drivers-2.6.38.patch 31 Mar 2011 20:39:18 -0000 1.2 |
| 24 |
@@ -1,38 +1,60 @@ |
| 25 |
---- ati.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-15 14:40:22.000000000 -0600 |
| 26 |
-+++ ati/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-15 14:38:09.000000000 -0600 |
| 27 |
-@@ -848,7 +848,7 @@ |
| 28 |
+--- cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-01-17 15:59:26.000000000 +0100 |
| 29 |
++++ cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-02-01 18:39:08.902218444 +0100 |
| 30 |
+@@ -848,7 +848,12 @@ |
| 31 |
* happen much less frequent then without this workaround. |
| 32 |
*/ |
| 33 |
if (state == PM_EVENT_SUSPEND) |
| 34 |
- acquire_console_sem(); |
| 35 |
++ |
| 36 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
| 37 |
+ console_lock(); |
| 38 |
++#else |
| 39 |
++ acquire_console_sem(); |
| 40 |
++#endif |
| 41 |
|
| 42 |
if (firegl_cail_powerdown(privdev, state)) |
| 43 |
ret = -EIO; |
| 44 |
-@@ -870,7 +870,7 @@ |
| 45 |
+@@ -870,8 +875,13 @@ |
| 46 |
} |
| 47 |
|
| 48 |
if (state == PM_EVENT_SUSPEND) |
| 49 |
- release_console_sem(); |
| 50 |
+- |
| 51 |
++ |
| 52 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
| 53 |
+ console_unlock(); |
| 54 |
- |
| 55 |
++#else |
| 56 |
++ release_console_sem(); |
| 57 |
++#endif |
| 58 |
++ |
| 59 |
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL); |
| 60 |
|
| 61 |
-@@ -894,7 +894,7 @@ |
| 62 |
+ return ret; |
| 63 |
+@@ -894,7 +904,12 @@ |
| 64 |
if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0; |
| 65 |
|
| 66 |
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) |
| 67 |
- acquire_console_sem(); |
| 68 |
++ |
| 69 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
| 70 |
+ console_lock(); |
| 71 |
++#else |
| 72 |
++ acquire_console_sem(); |
| 73 |
++#endif |
| 74 |
|
| 75 |
#ifdef FIREGL_USWC_SUPPORT |
| 76 |
// Restore the PAT after resuming from S3 or S4. |
| 77 |
-@@ -919,7 +919,7 @@ |
| 78 |
+@@ -919,7 +934,12 @@ |
| 79 |
firegl_cail_powerup(privdev); |
| 80 |
|
| 81 |
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) |
| 82 |
- release_console_sem(); |
| 83 |
++ |
| 84 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
| 85 |
+ console_unlock(); |
| 86 |
++#else |
| 87 |
++ release_console_sem(); |
| 88 |
++#endif |
| 89 |
|
| 90 |
PMSG_EVENT(pdev->dev.power.power_state) = 0; |
| 91 |
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL); |
Archives