---

yaml --- r: 179884 b: refs/heads/master c: e147eae h: refs/heads/master v: v3
git-mirror · Jan 14, 2010 · 3035773 · 3035773
1 parent ef18c2f
commit 3035773
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: 9855e584d296a32bbcc1bb3d29b7e0ed078b03cc
+refs/heads/master: e147eae80afe98b86a7921a40a709584e6603e34
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -469,6 +469,8 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
 
 	ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,
 					evict, no_wait, new_mem);
+	if (nvbo->channel && nvbo->channel != chan)
+		ret = nouveau_fence_wait(fence, NULL, false, false);
 	nouveau_fence_unref((void *)&fence);
 	return ret;
 }