---

yaml --- r: 228526 b: refs/heads/master c: aa5ac73 h: refs/heads/master v: v3
git-mirror · Dec 3, 2010 · 269ada8 · 269ada8
1 parent 733d913
commit 269ada8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb4b608b603c7fba4c1cf5b298d1aa23d3fdd22
+refs/heads/master: aa5ac7358c010dcb5916d1d0c2651ae65a4f7ab7
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -485,15 +485,8 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
 	if (ret)
 		return ret;
 
-	if (nvbo->channel) {
-		ret = nouveau_fence_sync(fence, nvbo->channel);
-		if (ret)
-			goto out;
-	}
-
 	ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict,
 					no_wait_reserve, no_wait_gpu, new_mem);
-out:
 	nouveau_fence_unref((void *)&fence);
 	return ret;
 }