diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-03-31 20:39:18 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-03-31 20:39:18 +0000 |
| commit | ca9d8d0afc59a5beea267635bdbf1471c361a4a1 (patch) | |
| tree | 8626fc20c1dfb5326e82873789b72b70375a5686 /x11-drivers/ati-drivers/files | |
| parent | clean old (diff) | |
| download | historical-ca9d8d0afc59a5beea267635bdbf1471c361a4a1.tar.gz historical-ca9d8d0afc59a5beea267635bdbf1471c361a4a1.tar.bz2 historical-ca9d8d0afc59a5beea267635bdbf1471c361a4a1.zip | |
Version bump, import of Enrico Tagliavini's ebuild from the x11 overlay.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers/ati-drivers/files')
| -rw-r--r-- | x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch index fea6c26ffabf..0c3970e0cbb1 100644 --- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.38.patch @@ -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); |