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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-04-27 19:45:46 +0000 (Wed, 27 Apr 2011)
New Revision: 579

Removed:
   fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff
   fglrx-driver/trunk/debian/patches/series
Log:
* New upstream release.
  - Remove merged patch 04-2.6.38-support.diff.
  - Refresh hunky patch 05-fix-global-kernel-lock.diff.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-04-27 19:43:22 UTC (rev 578)
+++ fglrx-driver/trunk/debian/changelog	2011-04-27 19:45:46 UTC (rev 579)
@@ -1,3 +1,11 @@
+fglrx-driver (1:11-4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Remove merged patch 04-2.6.38-support.diff.
+    - Refresh hunky patch 05-fix-global-kernel-lock.diff.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 27 Apr 2011 21:34:59 +0200
+
 fglrx-driver (1:11-3-1) unstable; urgency=low
 
   * New upstream release.

Deleted: fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff	2011-04-27 19:43:22 UTC (rev 578)
+++ fglrx-driver/trunk/debian/patches/04-2.6.38-support.diff	2011-04-27 19:45:46 UTC (rev 579)
@@ -1,59 +0,0 @@
-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/05-fix-global-kernel-lock.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff	2011-04-27 19:43:22 UTC (rev 578)
+++ fglrx-driver/trunk/debian/patches/05-fix-global-kernel-lock.diff	2011-04-27 19:45:46 UTC (rev 579)
@@ -1,8 +1,10 @@
 Description: add support for missing kernel lock
 Author: Pascal Giard <evilynux at gmail.com>
---- fglrx-driver-11-2/common/lib/modules/fglrx/build_mod/firegl_public.c.old	2011-03-18 14:51:25.000000000 -0400
-+++ fglrx-driver-11-2/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-18 14:52:33.000000000 -0400
-@@ -1913,13 +1913,17 @@
+
+diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:30:08.000000000 +0200
++++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:29:27.000000000 +0200
+@@ -1902,13 +1902,17 @@
  /** \brief Grab global kernel lock */
  void ATI_API_CALL KCL_GlobalKernelLock(void)
  {

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2011-04-27 19:43:22 UTC (rev 578)
+++ fglrx-driver/trunk/debian/patches/series	2011-04-27 19:45:46 UTC (rev 579)
@@ -1,6 +1,5 @@
 01-CONFIG_X86_XEN.diff
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
-04-2.6.38-support.diff
 05-fix-global-kernel-lock.diff
 06-no-smp-lock.diff