Commit c7ea16f6 authored by Christian König's avatar Christian König

drm/ttm: stop allocating a dummy resource for pipelined gutting

That should not be necessary any more when drivers should at least be
able to handle a move without a resource.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Acked-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230130120636.63765-5-matthew.auld@intel.com
parent 18025378
...@@ -704,30 +704,23 @@ EXPORT_SYMBOL(ttm_bo_move_sync_cleanup); ...@@ -704,30 +704,23 @@ EXPORT_SYMBOL(ttm_bo_move_sync_cleanup);
*/ */
int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
{ {
static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM };
struct ttm_buffer_object *ghost; struct ttm_buffer_object *ghost;
struct ttm_resource *sys_res;
struct ttm_tt *ttm; struct ttm_tt *ttm;
int ret; int ret;
ret = ttm_resource_alloc(bo, &sys_mem, &sys_res);
if (ret)
return ret;
/* If already idle, no need for ghost object dance. */ /* If already idle, no need for ghost object dance. */
if (dma_resv_test_signaled(bo->base.resv, DMA_RESV_USAGE_BOOKKEEP)) { if (dma_resv_test_signaled(bo->base.resv, DMA_RESV_USAGE_BOOKKEEP)) {
if (!bo->ttm) { if (!bo->ttm) {
/* See comment below about clearing. */ /* See comment below about clearing. */
ret = ttm_tt_create(bo, true); ret = ttm_tt_create(bo, true);
if (ret) if (ret)
goto error_free_sys_mem; return ret;
} else { } else {
ttm_tt_unpopulate(bo->bdev, bo->ttm); ttm_tt_unpopulate(bo->bdev, bo->ttm);
if (bo->type == ttm_bo_type_device) if (bo->type == ttm_bo_type_device)
ttm_tt_mark_for_clear(bo->ttm); ttm_tt_mark_for_clear(bo->ttm);
} }
ttm_resource_free(bo, &bo->resource); ttm_resource_free(bo, &bo->resource);
ttm_bo_assign_mem(bo, sys_res);
return 0; return 0;
} }
...@@ -744,7 +737,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) ...@@ -744,7 +737,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
ret = ttm_tt_create(bo, true); ret = ttm_tt_create(bo, true);
swap(bo->ttm, ttm); swap(bo->ttm, ttm);
if (ret) if (ret)
goto error_free_sys_mem; return ret;
ret = ttm_buffer_object_transfer(bo, &ghost); ret = ttm_buffer_object_transfer(bo, &ghost);
if (ret) if (ret)
...@@ -760,13 +753,9 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) ...@@ -760,13 +753,9 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
dma_resv_unlock(&ghost->base._resv); dma_resv_unlock(&ghost->base._resv);
ttm_bo_put(ghost); ttm_bo_put(ghost);
bo->ttm = ttm; bo->ttm = ttm;
ttm_bo_assign_mem(bo, sys_res);
return 0; return 0;
error_destroy_tt: error_destroy_tt:
ttm_tt_destroy(bo->bdev, ttm); ttm_tt_destroy(bo->bdev, ttm);
error_free_sys_mem:
ttm_resource_free(bo, &sys_res);
return ret; return ret;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment