chithanh 11/03/31 20:39:18
Modified: ati-drivers-2.6.38.patch
Log:
Version bump, import of Enrico Tagliavini's ebuild from the x11 overlay.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch
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
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
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
Index: ati-drivers-2.6.38.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ati-drivers-2.6.38.patch 22 Mar 2011 21:33:56 -0000 1.1
+++ ati-drivers-2.6.38.patch 31 Mar 2011 20:39:18 -0000 1.2
@@ -1,38 +1,60 @@
---- ati.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-15 14:40:22.000000000 -0600
-+++ ati/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-15 14:38:09.000000000 -0600
-@@ -848,7 +848,7 @@
+--- cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-01-17 15:59:26.000000000 +0100
++++ cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-02-01 18:39:08.902218444 +0100
+@@ -848,7 +848,12 @@
* happen much less frequent then without this workaround.
*/
if (state == PM_EVENT_SUSPEND)
- acquire_console_sem();
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_lock();
++#else
++ acquire_console_sem();
++#endif
if (firegl_cail_powerdown(privdev, state))
ret = -EIO;
-@@ -870,7 +870,7 @@
+@@ -870,8 +875,13 @@
}
if (state == PM_EVENT_SUSPEND)
- release_console_sem();
+-
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_unlock();
-
++#else
++ release_console_sem();
++#endif
++
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);
-@@ -894,7 +894,7 @@
+ return ret;
+@@ -894,7 +904,12 @@
if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
- acquire_console_sem();
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_lock();
++#else
++ acquire_console_sem();
++#endif
#ifdef FIREGL_USWC_SUPPORT
// Restore the PAT after resuming from S3 or S4.
-@@ -919,7 +919,7 @@
+@@ -919,7 +934,12 @@
firegl_cail_powerup(privdev);
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
- release_console_sem();
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_unlock();
++#else
++ release_console_sem();
++#endif
PMSG_EVENT(pdev->dev.power.power_state) = 0;
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);
|
