Merge lp:~vanvugt/ubuntu/oneiric/fglrx-installer-updates/fix-827652 into lp:ubuntu/oneiric/fglrx-installer-updates

[Daniel van Vugt]

Remove deprecated: replace-global-lock-with-a-driver-specific-mutex.patch as bug 776895 appears to be fixed from upstream now (LP: #827652)

A similar fix is already present in fglrx. It seems fglrx-updates was forgotten.

[Alberto Milone (albertomilone)]

Hi Daniel, thanks for working on this. I'll disable the patch manually (and give credit to you) in my git branch as that's where I maintain the driver.

Thanks

review: Disapprove

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-16 16:41:04 +0000
+++ debian/changelog	2011-08-19 05:45:23 +0000
@@ -1,3 +1,10 @@
+fglrx-installer-updates (2:8.872-0ubuntu3) oneiric; urgency=low
+
+  * Remove deprecated: replace-global-lock-with-a-driver-specific-mutex.patch
+    as bug 776895 appears to be fixed from upstream now (LP: #827652)
+
+ -- Daniel van Vugt <[e-mail]>  Fri, 19 Aug 2011 12:20:52 +0800
+
 fglrx-installer-updates (2:8.872-0ubuntu2) oneiric; urgency=low
 
   * debian/fglrx-updates.prerm.in:

=== modified file 'debian/dkms.conf.in'
--- debian/dkms.conf.in	2011-08-16 16:41:04 +0000
+++ debian/dkms.conf.in	2011-08-19 05:45:23 +0000
@@ -8,7 +8,3 @@
 MAKE[0]="cd ${dkms_tree}/fglrx/#CVERSION#/build; sh make.sh --nohints --uname_r=$kernelver --norootcheck"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
-PATCH[0]="replace-global-lock-with-a-driver-specific-mutex.patch"
-PATCH_MATCH[0]="^3.0"
-#PATCH[0]="rt_preempt_28.patch"
-#PATCH_MATCH[0]="^2.6.28\-[0-9]*\-rt$"

=== removed file 'debian/dkms/patches/replace-global-lock-with-a-driver-specific-mutex.patch'
--- debian/dkms/patches/replace-global-lock-with-a-driver-specific-mutex.patch	2011-08-11 16:11:25 +0000
+++ debian/dkms/patches/replace-global-lock-with-a-driver-specific-mutex.patch	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-From 33585d73b1ce3c9480d2cb928a75fb409ebd8717 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <[e-mail]>
-Date: Tue, 14 Jun 2011 19:47:56 +0200
-Subject: [PATCH 1/1] replace global lock with a driver specific mutex
-
----
- drmP.h          |    2 +-
- firegl_public.c |   11 +++++------
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/drmP.h b/drmP.h
-index b18e7e8..a8e9cae 100644
---- a/drmP.h
-+++ b/drmP.h
-@@ -57,7 +57,7 @@
- #include <linux/pci.h>
- #include <linux/version.h>
- #include <linux/sched.h>
--#include <linux/smp_lock.h>	/* For (un)lock_kernel */
-+#include <linux/mutex.h>
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #if defined(__alpha__) || defined(__powerpc__)
-diff --git a/firegl_public.c b/firegl_public.c
-index 66ae0c6..d9b19a2 100644
---- a/firegl_public.c
-+++ b/firegl_public.c
-@@ -114,7 +114,7 @@
- #include <linux/pci.h>
- #include <linux/wait.h>
- #include <linux/miscdevice.h>
--#include <linux/smp_lock.h>
-+#include <linux/mutex.h>
- // newer SuSE kernels need this
- #include <linux/highmem.h>
- 
-@@ -289,6 +289,8 @@ typedef enum
-     KCL_MEM_PAT_ENABLED_KERNEL
- } kcl_mem_pat_status_t;
- 
-+static DEFINE_MUTEX(ati_mutex);
-+
- static kcl_mem_pat_status_t kcl_mem_pat_status = KCL_MEM_PAT_DISABLED;
- static u64 kcl_mem_pat_orig_val; 
- 
-@@ -1048,9 +1050,6 @@ static int __init firegl_init_module(void)
- 
-     dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
- 
--    for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
--        dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
--
-     for (i=0; i < __KE_MAX_SEMAPHORES; i++)
-         sema_init(&dev->struct_sem[i], 1);
- 
-@@ -1900,13 +1899,13 @@ void ATI_API_CALL KCL_spin_unlock(void *lock)
- /** \brief Grab global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelLock(void)
- {
--    lock_kernel();
-+    mutex_lock(&ati_mutex);
- }
- 
- /** \brief Release global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelUnlock(void)
- {
--    unlock_kernel();
-+    mutex_unlock(&ati_mutex);
- }
- 
- /*****************************************************************************/
--- 
-1.7.4.1
-