---

yaml --- r: 210077 b: refs/heads/master c: ab699ec h: refs/heads/master i: 210075: 79742e3 v: v3
git-mirror · Aug 26, 2010 · 644287a · 644287a
1 parent ebb6145
commit 644287a
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: e3461a2bc0d67ce60a915e0f26e2a6eb4a4d4b99
+refs/heads/master: ab699ec64a4294f2f6ccd34b9bf8a2dcb4c4cb3c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c b/trunk/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -337,7 +337,9 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
 				return -EINVAL;
 			}
 
+			mutex_unlock(&drm_global_mutex);
 			ret = ttm_bo_wait_cpu(&nvbo->bo, false);
+			mutex_lock(&drm_global_mutex);
 			if (ret) {
 				NV_ERROR(dev, "fail wait_cpu\n");
 				return ret;