aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_bo.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-10-14 14:37:56 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 00:06:31 -0500
commitaa5ac7358c010dcb5916d1d0c2651ae65a4f7ab7 (patch)
tree1d1a60834921d3b29dad8f397c75a7cbfa2f18b9 /drivers/gpu/drm/nouveau/nouveau_bo.c
parentcbb4b608b603c7fba4c1cf5b298d1aa23d3fdd22 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index d8817b4bb189..8442bfbf5d42 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,
485 if (ret) 485 if (ret)
486 return ret; 486 return ret;
487 487
488 if (nvbo->channel) {
489 ret = nouveau_fence_sync(fence, nvbo->channel);
490 if (ret)
491 goto out;
492 }
493
494 ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict, 488 ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict,
495 no_wait_reserve, no_wait_gpu, new_mem); 489 no_wait_reserve, no_wait_gpu, new_mem);
496out:
497 nouveau_fence_unref((void *)&fence); 490 nouveau_fence_unref((void *)&fence);
498 return ret; 491 return ret;
499} 492}