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

drm/ttm: wait for BO idle after the move in ttm_bo_swapout 

Final part to avoid pre move waits.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2016-06-06 10:17:57 +02:00 committed by Alex Deucher
parent 17d33bc9d6
commit 61ede07055
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/ttm/ttm_bo.c
View File

@ -1655,14 +1655,9 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
ttm_bo_list_ref_sub(bo, put_count, true); ttm_bo_list_ref_sub(bo, put_count, true);
/** /**
* Wait for GPU, then move to system cached. * Move to system cached
*/ */
ret = ttm_bo_wait(bo, false, false);
if (unlikely(ret != 0))
goto out;
if ((bo->mem.placement & swap_placement) != swap_placement) { if ((bo->mem.placement & swap_placement) != swap_placement) {
struct ttm_mem_reg evict_mem; struct ttm_mem_reg evict_mem;
@ -1677,6 +1672,14 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
goto out; goto out;
} }
/**
* Make sure BO is idle.
*/
ret = ttm_bo_wait(bo, false, false);
if (unlikely(ret != 0))
goto out;
ttm_bo_unmap_virtual(bo); ttm_bo_unmap_virtual(bo);
/** /**