drm/nouveau: Synchronize buffer object moves in hardware.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
0c6c1c2fb8
commit
6479881752
|
@ -454,10 +454,15 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,
|
if (nvbo->channel) {
|
||||||
evict || (nvbo->channel &&
|
ret = nouveau_fence_sync(fence, nvbo->channel);
|
||||||
nvbo->channel != chan),
|
if (ret)
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict,
|
||||||
no_wait_reserve, no_wait_gpu, new_mem);
|
no_wait_reserve, no_wait_gpu, new_mem);
|
||||||
|
out:
|
||||||
nouveau_fence_unref((void *)&fence);
|
nouveau_fence_unref((void *)&fence);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue