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

Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 5
Proposed branch: lp:~vanvugt/ubuntu/oneiric/fglrx-installer-updates/fix-827652
Merge into: lp:ubuntu/oneiric/fglrx-installer-updates
Diff against target: 105 lines (+7/-78)
3 files modified
debian/changelog (+7/-0)
debian/dkms.conf.in (+0/-4)
debian/dkms/patches/replace-global-lock-with-a-driver-specific-mutex.patch (+0/-74)
To merge this branch: bzr merge lp:~vanvugt/ubuntu/oneiric/fglrx-installer-updates/fix-827652
Reviewer Review Type Date Requested Status
Alberto Milone Disapprove
Ubuntu Development Team Pending
Review via email: mp+72138@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Alberto Milone (albertomilone) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1fglrx-installer-updates (2:8.872-0ubuntu3) oneiric; urgency=low
2
3 * Remove deprecated: replace-global-lock-with-a-driver-specific-mutex.patch
4 as bug 776895 appears to be fixed from upstream now (LP: #827652)
5
6 -- Daniel van Vugt <vanvugt@gmail.com> Fri, 19 Aug 2011 12:20:52 +0800
7
1fglrx-installer-updates (2:8.872-0ubuntu2) oneiric; urgency=low8fglrx-installer-updates (2:8.872-0ubuntu2) oneiric; urgency=low
29
3 * debian/fglrx-updates.prerm.in:10 * debian/fglrx-updates.prerm.in:
411
=== 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 @@
8MAKE[0]="cd ${dkms_tree}/fglrx/#CVERSION#/build; sh make.sh --nohints --uname_r=$kernelver --norootcheck"8MAKE[0]="cd ${dkms_tree}/fglrx/#CVERSION#/build; sh make.sh --nohints --uname_r=$kernelver --norootcheck"
9DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"9DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
10AUTOINSTALL="yes"10AUTOINSTALL="yes"
11PATCH[0]="replace-global-lock-with-a-driver-specific-mutex.patch"
12PATCH_MATCH[0]="^3.0"
13#PATCH[0]="rt_preempt_28.patch"
14#PATCH_MATCH[0]="^2.6.28\-[0-9]*\-rt$"
1511
=== 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 @@
1From 33585d73b1ce3c9480d2cb928a75fb409ebd8717 Mon Sep 17 00:00:00 2001
2From: Alberto Milone <alberto.milone@canonical.com>
3Date: Tue, 14 Jun 2011 19:47:56 +0200
4Subject: [PATCH 1/1] replace global lock with a driver specific mutex
5
6---
7 drmP.h | 2 +-
8 firegl_public.c | 11 +++++------
9 2 files changed, 6 insertions(+), 7 deletions(-)
10
11diff --git a/drmP.h b/drmP.h
12index b18e7e8..a8e9cae 100644
13--- a/drmP.h
14+++ b/drmP.h
15@@ -57,7 +57,7 @@
16 #include <linux/pci.h>
17 #include <linux/version.h>
18 #include <linux/sched.h>
19-#include <linux/smp_lock.h> /* For (un)lock_kernel */
20+#include <linux/mutex.h>
21 #include <linux/mm.h>
22 #include <linux/pagemap.h>
23 #if defined(__alpha__) || defined(__powerpc__)
24diff --git a/firegl_public.c b/firegl_public.c
25index 66ae0c6..d9b19a2 100644
26--- a/firegl_public.c
27+++ b/firegl_public.c
28@@ -114,7 +114,7 @@
29 #include <linux/pci.h>
30 #include <linux/wait.h>
31 #include <linux/miscdevice.h>
32-#include <linux/smp_lock.h>
33+#include <linux/mutex.h>
34 // newer SuSE kernels need this
35 #include <linux/highmem.h>
36
37@@ -289,6 +289,8 @@ typedef enum
38 KCL_MEM_PAT_ENABLED_KERNEL
39 } kcl_mem_pat_status_t;
40
41+static DEFINE_MUTEX(ati_mutex);
42+
43 static kcl_mem_pat_status_t kcl_mem_pat_status = KCL_MEM_PAT_DISABLED;
44 static u64 kcl_mem_pat_orig_val;
45
46@@ -1048,9 +1050,6 @@ static int __init firegl_init_module(void)
47
48 dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
49
50- for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
51- dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
52-
53 for (i=0; i < __KE_MAX_SEMAPHORES; i++)
54 sema_init(&dev->struct_sem[i], 1);
55
56@@ -1900,13 +1899,13 @@ void ATI_API_CALL KCL_spin_unlock(void *lock)
57 /** \brief Grab global kernel lock */
58 void ATI_API_CALL KCL_GlobalKernelLock(void)
59 {
60- lock_kernel();
61+ mutex_lock(&ati_mutex);
62 }
63
64 /** \brief Release global kernel lock */
65 void ATI_API_CALL KCL_GlobalKernelUnlock(void)
66 {
67- unlock_kernel();
68+ mutex_unlock(&ati_mutex);
69 }
70
71 /*****************************************************************************/
72--
731.7.4.1
74

Subscribers

People subscribed via source and target branches