summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_bo.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-09-24 15:18:28 +1000
committerDave Airlie <airlied@redhat.com>2020-10-06 10:23:24 +1000
commit8117713d7804d168f91edebcb498067664c38e6e (patch)
tree264a5fe14055d9ce396a4fbd07c8747292365445 /drivers/gpu/drm/nouveau/nouveau_bo.c
parent12b68474e6d550ccbe7c47b8e293b6ef05cea3eb (diff)
downloadlinux-8117713d7804d168f91edebcb498067664c38e6e.tar.bz2
drm/nouveau/ttm: memcpy waits for bo already
no need for driver to wait here. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200924051845.397177-29-airlied@gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index c7f42c4a9395..0c0ca44a6802 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1085,9 +1085,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
}
/* Fallback to software copy. */
- ret = ttm_bo_wait_ctx(bo, ctx);
- if (ret == 0)
- ret = ttm_bo_move_memcpy(bo, ctx, new_reg);
+ ret = ttm_bo_move_memcpy(bo, ctx, new_reg);
out:
if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {