AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 01:45:23 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/ttm: return -EBUSY on pipelining with no_gpu_wait (v2)

Browse Source 
Setting the no_gpu_wait flag means that the allocate BO must be available
immediately and we can't wait for any GPU operation to finish.

v2: squash in mem leak fix, rebase

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2019-09-16 10:20:47 -05:00 committed by Alex Deucher
parent 6817bf283b
commit 3084cf46cf
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,7 +925,8 @@ EXPORT_SYMBOL(ttm_bo_mem_put);
*/ */
static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
struct ttm_mem_type_manager *man, struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem) struct ttm_mem_reg *mem,
bool no_wait_gpu)
{ {
struct dma_fence *fence; struct dma_fence *fence;
int ret; int ret;
@ -934,19 +935,22 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
fence = dma_fence_get(man->move); fence = dma_fence_get(man->move);
spin_unlock(&man->move_lock); spin_unlock(&man->move_lock);
if (fence) { if (!fence)
dma_resv_add_shared_fence(bo->base.resv, fence); return 0;
ret = dma_resv_reserve_shared(bo->base.resv, 1); if (no_wait_gpu)
if (unlikely(ret)) { return -EBUSY;
dma_fence_put(fence);
return ret;
}
dma_fence_put(bo->moving); dma_resv_add_shared_fence(bo->base.resv, fence);
bo->moving = fence;
ret = dma_resv_reserve_shared(bo->base.resv, 1);
if (unlikely(ret)) {
dma_fence_put(fence);
return ret;
} }
dma_fence_put(bo->moving);
bo->moving = fence;
return 0; return 0;
} }
@ -977,7 +981,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
return ret; return ret;
} while (1); } while (1);
return ttm_bo_add_move_fence(bo, man, mem); return ttm_bo_add_move_fence(bo, man, mem, ctx->no_wait_gpu);
} }
static uint32_t ttm_bo_select_caching(struct ttm_mem_type_manager *man, static uint32_t ttm_bo_select_caching(struct ttm_mem_type_manager *man,
@ -1119,14 +1123,18 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
if (unlikely(ret)) if (unlikely(ret))
goto error; goto error;
if (mem->mm_node) { if (!mem->mm_node)
ret = ttm_bo_add_move_fence(bo, man, mem); continue;
if (unlikely(ret)) {
(*man->func->put_node)(man, mem); ret = ttm_bo_add_move_fence(bo, man, mem, ctx->no_wait_gpu);
goto error; if (unlikely(ret)) {
} (*man->func->put_node)(man, mem);
return 0; if (ret == -EBUSY)
continue;
goto error;
} }
return 0;
} }
for (i = 0; i < placement->num_busy_placement; ++i) { for (i = 0; i < placement->num_busy_placement; ++i) {