diff options
| author | Christian König <christian.koenig@amd.com> | 2016-06-06 10:17:57 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 14:54:37 -0400 |
| commit | 61ede070555395fb1c231311c35464d9cd1a8a81 (patch) | |
| tree | 85e508fffc72e0bbbb43ab68091c06ece906d451 /drivers/gpu/drm/ttm | |
| parent | 17d33bc9d6ef96008c8e6ee062da8d955fae97f7 (diff) | |
| download | blackbird-obmc-linux-61ede070555395fb1c231311c35464d9cd1a8a81.tar.gz blackbird-obmc-linux-61ede070555395fb1c231311c35464d9cd1a8a81.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 86dd695021a6..c3c615c525a4 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1655,14 +1655,9 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) 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) { struct ttm_mem_reg evict_mem; @@ -1677,6 +1672,14 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) 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); /** |
