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

Proposed by Daniel van Vugt on 2011-08-19
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 2011-09-02 Disapprove on 2011-09-02
Ubuntu Development Team 2011-08-19 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.
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-08-16 16:41:04 +0000
3+++ debian/changelog 2011-08-19 05:45:23 +0000
4@@ -1,3 +1,10 @@
5+fglrx-installer-updates (2:8.872-0ubuntu3) oneiric; urgency=low
6+
7+ * Remove deprecated: replace-global-lock-with-a-driver-specific-mutex.patch
8+ as bug 776895 appears to be fixed from upstream now (LP: #827652)
9+
10+ -- Daniel van Vugt <vanvugt@gmail.com> Fri, 19 Aug 2011 12:20:52 +0800
11+
12 fglrx-installer-updates (2:8.872-0ubuntu2) oneiric; urgency=low
13
14 * debian/fglrx-updates.prerm.in:
15
16=== modified file 'debian/dkms.conf.in'
17--- debian/dkms.conf.in 2011-08-16 16:41:04 +0000
18+++ debian/dkms.conf.in 2011-08-19 05:45:23 +0000
19@@ -8,7 +8,3 @@
20 MAKE[0]="cd ${dkms_tree}/fglrx/#CVERSION#/build; sh make.sh --nohints --uname_r=$kernelver --norootcheck"
21 DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
22 AUTOINSTALL="yes"
23-PATCH[0]="replace-global-lock-with-a-driver-specific-mutex.patch"
24-PATCH_MATCH[0]="^3.0"
25-#PATCH[0]="rt_preempt_28.patch"
26-#PATCH_MATCH[0]="^2.6.28\-[0-9]*\-rt$"
27
28=== removed file 'debian/dkms/patches/replace-global-lock-with-a-driver-specific-mutex.patch'
29--- debian/dkms/patches/replace-global-lock-with-a-driver-specific-mutex.patch 2011-08-11 16:11:25 +0000
30+++ debian/dkms/patches/replace-global-lock-with-a-driver-specific-mutex.patch 1970-01-01 00:00:00 +0000
31@@ -1,74 +0,0 @@
32-From 33585d73b1ce3c9480d2cb928a75fb409ebd8717 Mon Sep 17 00:00:00 2001
33-From: Alberto Milone <alberto.milone@canonical.com>
34-Date: Tue, 14 Jun 2011 19:47:56 +0200
35-Subject: [PATCH 1/1] replace global lock with a driver specific mutex
36-
37----
38- drmP.h | 2 +-
39- firegl_public.c | 11 +++++------
40- 2 files changed, 6 insertions(+), 7 deletions(-)
41-
42-diff --git a/drmP.h b/drmP.h
43-index b18e7e8..a8e9cae 100644
44---- a/drmP.h
45-+++ b/drmP.h
46-@@ -57,7 +57,7 @@
47- #include <linux/pci.h>
48- #include <linux/version.h>
49- #include <linux/sched.h>
50--#include <linux/smp_lock.h> /* For (un)lock_kernel */
51-+#include <linux/mutex.h>
52- #include <linux/mm.h>
53- #include <linux/pagemap.h>
54- #if defined(__alpha__) || defined(__powerpc__)
55-diff --git a/firegl_public.c b/firegl_public.c
56-index 66ae0c6..d9b19a2 100644
57---- a/firegl_public.c
58-+++ b/firegl_public.c
59-@@ -114,7 +114,7 @@
60- #include <linux/pci.h>
61- #include <linux/wait.h>
62- #include <linux/miscdevice.h>
63--#include <linux/smp_lock.h>
64-+#include <linux/mutex.h>
65- // newer SuSE kernels need this
66- #include <linux/highmem.h>
67-
68-@@ -289,6 +289,8 @@ typedef enum
69- KCL_MEM_PAT_ENABLED_KERNEL
70- } kcl_mem_pat_status_t;
71-
72-+static DEFINE_MUTEX(ati_mutex);
73-+
74- static kcl_mem_pat_status_t kcl_mem_pat_status = KCL_MEM_PAT_DISABLED;
75- static u64 kcl_mem_pat_orig_val;
76-
77-@@ -1048,9 +1050,6 @@ static int __init firegl_init_module(void)
78-
79- dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
80-
81-- for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
82-- dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
83--
84- for (i=0; i < __KE_MAX_SEMAPHORES; i++)
85- sema_init(&dev->struct_sem[i], 1);
86-
87-@@ -1900,13 +1899,13 @@ void ATI_API_CALL KCL_spin_unlock(void *lock)
88- /** \brief Grab global kernel lock */
89- void ATI_API_CALL KCL_GlobalKernelLock(void)
90- {
91-- lock_kernel();
92-+ mutex_lock(&ati_mutex);
93- }
94-
95- /** \brief Release global kernel lock */
96- void ATI_API_CALL KCL_GlobalKernelUnlock(void)
97- {
98-- unlock_kernel();
99-+ mutex_unlock(&ati_mutex);
100- }
101-
102- /*****************************************************************************/
103---
104-1.7.4.1
105-

Subscribers

People subscribed via source and target branches