Skip to content

Commit

Permalink
drm/ttm: fix pipelined gutting
Browse files Browse the repository at this point in the history
We need to make sure to allocate the sys_mem resource before the point
of no return.

Signed-off-by: Christian König <christian.koenig@amd.com>
  • Loading branch information
Christian König authored and intel-lab-lkp committed Jun 8, 2021
1 parent 8663aa7 commit f7422b9
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions drivers/gpu/drm/ttm/ttm_bo_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ 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_resource *sys_res;
struct ttm_tt *ttm;
int ret;

Expand All @@ -602,6 +603,9 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
return ttm_resource_alloc(bo, &sys_mem, &bo->resource);
}


ret = ttm_resource_alloc(bo, &sys_mem, &sys_res);

/*
* We need an unpopulated ttm_tt after giving our current one,
* if any, to the ghost object. And we can't afford to fail
Expand All @@ -615,13 +619,11 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
ret = ttm_tt_create(bo, true);
swap(bo->ttm, ttm);
if (ret)
return ret;
goto error_free_sys_mem;

ret = ttm_buffer_object_transfer(bo, &ghost);
if (ret) {
ttm_tt_destroy(bo->bdev, ttm);
return ret;
}
if (ret)
goto error_destroy_tt;

ret = dma_resv_copy_fences(&ghost->base._resv, bo->base.resv);
/* Last resort, wait for the BO to be idle when we are OOM */
Expand All @@ -631,6 +633,14 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
dma_resv_unlock(&ghost->base._resv);
ttm_bo_put(ghost);
bo->ttm = ttm;
bo->resource = NULL;
ttm_bo_assign_mem(bo, sys_mem);
return 0;

return ttm_resource_alloc(bo, &sys_mem, &bo->resource);
error_destroy_tt:
ttm_tt_destroy(bo->bdev, ttm);

error_free_sys_mem:
ttm_resource_free(bo, &sys_mem);
return ret;
}

0 comments on commit f7422b9

Please sign in to comment.