]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
drm/nouveau: Leave BO eviction synchronization for later.
authorFrancisco Jerez <currojerez@riseup.net>
Thu, 14 Oct 2010 18:37:56 +0000 (20:37 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 3 Dec 2010 05:06:31 +0000 (15:06 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_bo.c

index d8817b4bb1894c04fb48bb74524f437212436683..8442bfbf5d4240c9715f66601b72222c4647bbac 100644 (file)
@@ -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;
 }