---

yaml --- r: 210081 b: refs/heads/master c: 08f2e66 h: refs/heads/master i: 210079: 62a9f2e v: v3
git-mirror · Aug 26, 2010 · 3f0504c · 3f0504c
1 parent 8e0dc67
commit 3f0504c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12acd90f0b97a4ce4574ca1e951cbca026e92560
+refs/heads/master: 08f2e669a81b5906adf6e4716f92d99d7966d224
diff --git a/trunk/drivers/gpu/drm/drm_lock.c b/trunk/drivers/gpu/drm/drm_lock.c
@@ -92,7 +92,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 		}
 
 		/* Contention */
+		mutex_unlock(&drm_global_mutex);
 		schedule();
+		mutex_lock(&drm_global_mutex);
 		if (signal_pending(current)) {
 			ret = -EINTR;
 			break;