From ff0406ef0a9aedb9d3101eebca7654bf1e0cbeae Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Sat, 30 Jan 2010 23:21:38 +0100
Subject: [PATCH] --- yaml --- r: 180479 b: refs/heads/master c:
 f0fbe3eb5f65fe5948219f4ceac68f8a665b1fc6 h: refs/heads/master i:   180477:
 39814433658d659d14234b9ff53350fad48501a0   180475:
 5376aa59d2d41d5f94a2358b6d632dd7a20343e0   180471:
 6305326863529eb5895e7f16a4db779d9c0cc8f1   180463:
 9b76aaf4c69e9b0758aa93a6d9f9bfb7a9559edb   180447:
 daacef9a3ed7fbfeeba00710ded1912c5af43a0a   180415:
 f6277383b5d9aaf83778274aa83156ec37b4694e   180351:
 46a63357cbaff0c621c2c9269499981826b46d42   180223:
 d6ecfc0a2658379b0710cf00f231f5a199e10333 v: v3

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

diff --git a/[refs] b/[refs]
index 54596fa05dbd..c37bce8cd199 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 139295b671ff4ccd904f2fa58e9dbc0fe99cc7fe
+refs/heads/master: f0fbe3eb5f65fe5948219f4ceac68f8a665b1fc6
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c b/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c
index 6ac804b0c9f9..70cc30803e3b 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -925,7 +925,9 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
 	}
 
 	if (req->flags & NOUVEAU_GEM_CPU_PREP_NOBLOCK) {
+		spin_lock(&nvbo->bo.lock);
 		ret = ttm_bo_wait(&nvbo->bo, false, false, no_wait);
+		spin_unlock(&nvbo->bo.lock);
 	} else {
 		ret = ttm_bo_synccpu_write_grab(&nvbo->bo, no_wait);
 		if (ret == 0)