From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 14 Oct 2010 18:37:56 +0000 (+0200)
Subject: drm/nouveau: Leave BO eviction synchronization for later.
X-Git-Tag: v2.6.38-rc1~419^2~37^2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa5ac7358c010dcb5916d1d0c2651ae65a4f7ab7;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

drm/nouveau: Leave BO eviction synchronization for later.

The pushbuf ioctl syncs after validation, no need for this anymore.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index d8817b4..8442bfb 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/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;
 }