From 3f0504cb3e3158f083f2662df255774ebb13b03e Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 27 Aug 2010 08:55:28 +1000
Subject: [PATCH] --- yaml --- r: 210081 b: refs/heads/master c:
 08f2e669a81b5906adf6e4716f92d99d7966d224 h: refs/heads/master i:   210079:
 62a9f2e11f439bb6e0fc2915cd42f08f488dffd2 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/drm_lock.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dc66a9370eed..48b9d7ec4360 100644
--- 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
index e2f70a516c34..9bf93bc9a32c 100644
--- 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;