diff options
author | Roger He <Hongbo.He@amd.com> | 2017-12-08 07:19:32 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-15 17:14:25 -0500 |
commit | 3e98d829ad0a59425f816c94447b4ac39a72f632 (patch) | |
tree | 0aa33f95f9b46838a8f169ec2c079709f0f0cb02 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
parent | 4985c9fc5f5231e93c4dcfd067d2c6a70e4fe6b8 (diff) |
drm/ttm: use an ttm operation ctx for ttm_bo_move_xxx
include ttm_bo_move_memcpy and ttm_bo_move_ttm
Signed-off-by: Roger He <Hongbo.He@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 7db9556b389b..c307a7d2cf16 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -505,7 +505,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict, | |||
505 | if (unlikely(r)) { | 505 | if (unlikely(r)) { |
506 | goto out_cleanup; | 506 | goto out_cleanup; |
507 | } | 507 | } |
508 | r = ttm_bo_move_ttm(bo, ctx->interruptible, ctx->no_wait_gpu, new_mem); | 508 | r = ttm_bo_move_ttm(bo, ctx, new_mem); |
509 | out_cleanup: | 509 | out_cleanup: |
510 | ttm_bo_mem_put(bo, &tmp_mem); | 510 | ttm_bo_mem_put(bo, &tmp_mem); |
511 | return r; | 511 | return r; |
@@ -536,7 +536,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict, | |||
536 | if (unlikely(r)) { | 536 | if (unlikely(r)) { |
537 | return r; | 537 | return r; |
538 | } | 538 | } |
539 | r = ttm_bo_move_ttm(bo, ctx->interruptible, ctx->no_wait_gpu, &tmp_mem); | 539 | r = ttm_bo_move_ttm(bo, ctx, &tmp_mem); |
540 | if (unlikely(r)) { | 540 | if (unlikely(r)) { |
541 | goto out_cleanup; | 541 | goto out_cleanup; |
542 | } | 542 | } |
@@ -597,8 +597,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, | |||
597 | 597 | ||
598 | if (r) { | 598 | if (r) { |
599 | memcpy: | 599 | memcpy: |
600 | r = ttm_bo_move_memcpy(bo, ctx->interruptible, | 600 | r = ttm_bo_move_memcpy(bo, ctx, new_mem); |
601 | ctx->no_wait_gpu, new_mem); | ||
602 | if (r) { | 601 | if (r) { |
603 | return r; | 602 | return r; |
604 | } | 603 | } |