---

yaml --- r: 180479 b: refs/heads/master c: f0fbe3e h: refs/heads/master i: 180477: 3981443 180475: 5376aa5 180471: 6305326 180463: 9b76aaf 180447: daacef9 180415: f627738 180351: 46a6335 180223: d6ecfc0 v: v3
git-mirror · Feb 9, 2010 · ff0406e · ff0406e
1 parent 4348448
commit ff0406e
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: 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
@@ -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)