[Pkg-fglrx-devel] r543 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-02-03 21:01:45 +0000 (Thu, 03 Feb 2011)
New Revision: 543

Added:
   fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 04-2.6.38-support from Miguel Colon <debian.micove at gmail.com>, to
  add Linux 2.6.38 support.
  Closes: #611779


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-02-03 20:56:43 UTC (rev 542)
+++ fglrx-driver/trunk/debian/changelog	2011-02-03 21:01:45 UTC (rev 543)
@@ -1,3 +1,11 @@
+fglrx-driver (1:11-1-2) UNRELEASED; urgency=low
+
+  * Add patch 04-2.6.38-support from Miguel Colon <debian.micove at gmail.com>, to
+    add Linux 2.6.38 support.
+    Closes: #611779
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 03 Feb 2011 22:00:08 +0100
+
 fglrx-driver (1:11-1-1) experimental; urgency=low
 
   * New upstream release.

Added: fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff	2011-02-03 21:01:45 UTC (rev 543)
@@ -0,0 +1,59 @@
+Description: Add Linux 2.6.38 support
+ The following commit renamed acquire_console_sem to console_lock and
+ release_console_sem to console_unlock on the Linux kernel:
+ http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff
+Author: Miguel Colon <debian.micove at gmail.com>
+Forwarded: no
+Last-Update: 2011-02-01
+
+--- fglrx-driver-11-1.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ fglrx-driver-11-1/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -850,7 +850,12 @@ static int fglrx_pci_suspend(struct pci_
+      * happen much less frequent then without this workaround.
+      */
+     if (state == PM_EVENT_SUSPEND)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++        console_lock();
++#else
+         acquire_console_sem();
++#endif
++
+ 
+     if (firegl_cail_powerdown(privdev, state))
+         ret = -EIO;
+@@ -872,7 +877,11 @@ static int fglrx_pci_suspend(struct pci_
+     }
+ 
+     if (state == PM_EVENT_SUSPEND)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++        console_unlock();
++#else
+         release_console_sem();
++#endif
+ 
+     KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);  
+     
+@@ -896,7 +905,11 @@ static int fglrx_pci_resume(struct pci_d
+     if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
+ 
+     if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
++#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.
+@@ -921,7 +934,11 @@ static int fglrx_pci_resume(struct pci_d
+     firegl_cail_powerup(privdev);
+ 
+     if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
++#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);  

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2011-02-03 20:56:43 UTC (rev 542)
+++ fglrx-driver/trunk/debian/patches/series	2011-02-03 21:01:45 UTC (rev 543)
@@ -1,3 +1,4 @@
 01-CONFIG_X86_XEN.diff
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
+04-2.6.38-support.diff