openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/ttm: explicitly wait for bo idle before memcpy buffer move 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-11-22 10:52:54 +10:00
parent 35b8141b82
commit cef9e99e1e
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -1180,28 +1180,27 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
goto out; goto out;
} }
/* CPU copy if we have no accelerated method available */ /* Hardware assisted copy. */
if (!drm->ttm.move) { if (drm->ttm.move) {
ret = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem); if (new_mem->mem_type == TTM_PL_SYSTEM)
goto out; ret = nouveau_bo_move_flipd(bo, evict, intr,
no_wait_gpu, new_mem);
else if (old_mem->mem_type == TTM_PL_SYSTEM)
ret = nouveau_bo_move_flips(bo, evict, intr,
no_wait_gpu, new_mem);
else
ret = nouveau_bo_move_m2mf(bo, evict, intr,
no_wait_gpu, new_mem);
if (!ret)
goto out;
} }
/* Hardware assisted copy. */
if (new_mem->mem_type == TTM_PL_SYSTEM)
ret = nouveau_bo_move_flipd(bo, evict, intr,
no_wait_gpu, new_mem);
else if (old_mem->mem_type == TTM_PL_SYSTEM)
ret = nouveau_bo_move_flips(bo, evict, intr,
no_wait_gpu, new_mem);
else
ret = nouveau_bo_move_m2mf(bo, evict, intr,
no_wait_gpu, new_mem);
if (!ret)
goto out;
/* Fallback to software copy. */ /* Fallback to software copy. */
ret = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem); spin_lock(&bo->bdev->fence_lock);
ret = ttm_bo_wait(bo, true, intr, no_wait_gpu);
spin_unlock(&bo->bdev->fence_lock);
if (ret == 0)
ret = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
out: out:
if (nv_device(drm->device)->card_type < NV_50) { if (nv_device(drm->device)->card_type < NV_50) {