Commit b1ec2924 authored by Dave Airlie's avatar Dave Airlie

drm/radeon: cleanup ttm operation ctx usage.

Just pass it around move, and remove unused pieces
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923030454.362731-4-airlied@gmail.com
parent 6b7741e4
...@@ -151,7 +151,7 @@ static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp) ...@@ -151,7 +151,7 @@ static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp)
} }
static int radeon_move_blit(struct ttm_buffer_object *bo, static int radeon_move_blit(struct ttm_buffer_object *bo,
bool evict, bool no_wait_gpu, bool evict,
struct ttm_resource *new_mem, struct ttm_resource *new_mem,
struct ttm_resource *old_mem) struct ttm_resource *old_mem)
{ {
...@@ -206,11 +206,10 @@ static int radeon_move_blit(struct ttm_buffer_object *bo, ...@@ -206,11 +206,10 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
} }
static int radeon_move_vram_ram(struct ttm_buffer_object *bo, static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
bool evict, bool interruptible, bool evict,
bool no_wait_gpu, struct ttm_operation_ctx *ctx,
struct ttm_resource *new_mem) struct ttm_resource *new_mem)
{ {
struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };
struct ttm_resource *old_mem = &bo->mem; struct ttm_resource *old_mem = &bo->mem;
struct ttm_resource tmp_mem; struct ttm_resource tmp_mem;
struct ttm_place placements; struct ttm_place placements;
...@@ -227,7 +226,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, ...@@ -227,7 +226,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
placements.lpfn = 0; placements.lpfn = 0;
placements.mem_type = TTM_PL_TT; placements.mem_type = TTM_PL_TT;
placements.flags = TTM_PL_MASK_CACHING; placements.flags = TTM_PL_MASK_CACHING;
r = ttm_bo_mem_space(bo, &placement, &tmp_mem, &ctx); r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
if (unlikely(r)) { if (unlikely(r)) {
return r; return r;
} }
...@@ -237,7 +236,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, ...@@ -237,7 +236,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
goto out_cleanup; goto out_cleanup;
} }
r = ttm_tt_populate(bo->bdev, bo->ttm, &ctx); r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
if (unlikely(r)) { if (unlikely(r)) {
goto out_cleanup; goto out_cleanup;
} }
...@@ -246,22 +245,21 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, ...@@ -246,22 +245,21 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
if (unlikely(r)) { if (unlikely(r)) {
goto out_cleanup; goto out_cleanup;
} }
r = radeon_move_blit(bo, true, no_wait_gpu, &tmp_mem, old_mem); r = radeon_move_blit(bo, true, &tmp_mem, old_mem);
if (unlikely(r)) { if (unlikely(r)) {
goto out_cleanup; goto out_cleanup;
} }
r = ttm_bo_move_ttm(bo, &ctx, new_mem); r = ttm_bo_move_ttm(bo, ctx, new_mem);
out_cleanup: out_cleanup:
ttm_resource_free(bo, &tmp_mem); ttm_resource_free(bo, &tmp_mem);
return r; return r;
} }
static int radeon_move_ram_vram(struct ttm_buffer_object *bo, static int radeon_move_ram_vram(struct ttm_buffer_object *bo,
bool evict, bool interruptible, bool evict,
bool no_wait_gpu, struct ttm_operation_ctx *ctx,
struct ttm_resource *new_mem) struct ttm_resource *new_mem)
{ {
struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu };
struct ttm_resource *old_mem = &bo->mem; struct ttm_resource *old_mem = &bo->mem;
struct ttm_resource tmp_mem; struct ttm_resource tmp_mem;
struct ttm_placement placement; struct ttm_placement placement;
...@@ -278,15 +276,15 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo, ...@@ -278,15 +276,15 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo,
placements.lpfn = 0; placements.lpfn = 0;
placements.mem_type = TTM_PL_TT; placements.mem_type = TTM_PL_TT;
placements.flags = TTM_PL_MASK_CACHING; placements.flags = TTM_PL_MASK_CACHING;
r = ttm_bo_mem_space(bo, &placement, &tmp_mem, &ctx); r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
if (unlikely(r)) { if (unlikely(r)) {
return r; return r;
} }
r = ttm_bo_move_ttm(bo, &ctx, &tmp_mem); r = ttm_bo_move_ttm(bo, ctx, &tmp_mem);
if (unlikely(r)) { if (unlikely(r)) {
goto out_cleanup; goto out_cleanup;
} }
r = radeon_move_blit(bo, true, no_wait_gpu, new_mem, old_mem); r = radeon_move_blit(bo, true, new_mem, old_mem);
if (unlikely(r)) { if (unlikely(r)) {
goto out_cleanup; goto out_cleanup;
} }
...@@ -334,14 +332,12 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, ...@@ -334,14 +332,12 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,
if (old_mem->mem_type == TTM_PL_VRAM && if (old_mem->mem_type == TTM_PL_VRAM &&
new_mem->mem_type == TTM_PL_SYSTEM) { new_mem->mem_type == TTM_PL_SYSTEM) {
r = radeon_move_vram_ram(bo, evict, ctx->interruptible, r = radeon_move_vram_ram(bo, evict, ctx, new_mem);
ctx->no_wait_gpu, new_mem);
} else if (old_mem->mem_type == TTM_PL_SYSTEM && } else if (old_mem->mem_type == TTM_PL_SYSTEM &&
new_mem->mem_type == TTM_PL_VRAM) { new_mem->mem_type == TTM_PL_VRAM) {
r = radeon_move_ram_vram(bo, evict, ctx->interruptible, r = radeon_move_ram_vram(bo, evict, ctx, new_mem);
ctx->no_wait_gpu, new_mem);
} else { } else {
r = radeon_move_blit(bo, evict, ctx->no_wait_gpu, r = radeon_move_blit(bo, evict,
new_mem, old_mem); new_mem, old_mem);
} }
......
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