Re: [PATCH 3/6] drm/ttm: use an ttm operation ctx for ttm_bo_move_xxx

Am 12.12.2017 um 10:33 schrieb Roger He:

include ttm_bo_move_memcpy and ttm_bo_move_ttm

Change-Id: I160b2fe1da3200405810d0215c4521b5f0d3615a Signed-off-by: Roger He Hongbo.He@amd.com

Reviewed-by: Christian König christian.koenig@amd.com

But please separate that out and wait for a few days before committing, maybe some nouveau devs have objections.

Christian.

---

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 7 +++---- drivers/gpu/drm/nouveau/nouveau_bo.c | 7 +++---- drivers/gpu/drm/qxl/qxl_ttm.c | 3 +-- drivers/gpu/drm/radeon/radeon_ttm.c | 7 +++---- drivers/gpu/drm/ttm/ttm_bo.c | 6 ++---- drivers/gpu/drm/ttm/ttm_bo_util.c | 8 ++++---- include/drm/ttm/ttm_bo_driver.h | 4 ++-- 7 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 7db9556..c307a7d 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, if (unlikely(r)) { goto out_cleanup; }

• r = ttm_bo_move_ttm(bo, ctx->interruptible, ctx->no_wait_gpu, new_mem);

• r = ttm_bo_move_ttm(bo, ctx, new_mem); out_cleanup: ttm_bo_mem_put(bo, &tmp_mem); return r;

@@ -536,7 +536,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict, if (unlikely(r)) { return r; }

• r = ttm_bo_move_ttm(bo, ctx->interruptible, ctx->no_wait_gpu, &tmp_mem);

• r = ttm_bo_move_ttm(bo, ctx, &tmp_mem); if (unlikely(r)) { goto out_cleanup; }

@@ -597,8 +597,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,

if (r) { memcpy:

• r = ttm_bo_move_memcpy(bo, ctx->interruptible,
  

• 		       ctx->no_wait_gpu, new_mem);
  

• r = ttm_bo_move_memcpy(bo, ctx, new_mem);
  

  if (r) { return r; }

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 949bf6b..6b6fb20 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1226,7 +1226,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, if (ret) goto out;

• ret = ttm_bo_move_ttm(bo, intr, no_wait_gpu, new_reg);

• ret = ttm_bo_move_ttm(bo, &ctx, new_reg); out: ttm_bo_mem_put(bo, &tmp_reg); return ret;

@@ -1255,7 +1255,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, if (ret) return ret;

• ret = ttm_bo_move_ttm(bo, intr, no_wait_gpu, &tmp_reg);

• ret = ttm_bo_move_ttm(bo, &ctx, &tmp_reg); if (ret) goto out;

@@ -1380,8 +1380,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, /* Fallback to software copy. */ ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu); if (ret == 0)

• ret = ttm_bo_move_memcpy(bo, ctx->interruptible,
  

• 			 ctx->no_wait_gpu, new_reg);
  

• ret = ttm_bo_move_memcpy(bo, ctx, new_reg);
  
  

  out: if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {

diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index d866f32..78ce118 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -357,8 +357,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict, qxl_move_null(bo, new_mem); return 0; }

• return ttm_bo_move_memcpy(bo, ctx->interruptible, ctx->no_wait_gpu,

• 		  new_mem);
  

• return ttm_bo_move_memcpy(bo, ctx, new_mem); }

  static void qxl_bo_move_notify(struct ttm_buffer_object *bo,

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 98e30d7..557fd79 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -347,7 +347,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, if (unlikely(r)) { goto out_cleanup; }

• r = ttm_bo_move_ttm(bo, interruptible, no_wait_gpu, new_mem);

• r = ttm_bo_move_ttm(bo, &ctx, new_mem); out_cleanup: ttm_bo_mem_put(bo, &tmp_mem); return r;

@@ -380,7 +380,7 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo, if (unlikely(r)) { return r; }

• r = ttm_bo_move_ttm(bo, interruptible, no_wait_gpu, &tmp_mem);

• r = ttm_bo_move_ttm(bo, &ctx, &tmp_mem); if (unlikely(r)) { goto out_cleanup; }

@@ -445,8 +445,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,

if (r) { memcpy:

• r = ttm_bo_move_memcpy(bo, ctx->interruptible,
  

• 		       ctx->no_wait_gpu, new_mem);
  

• r = ttm_bo_move_memcpy(bo, ctx, new_mem);
  

  if (r) { return r; }

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 70b2673..17fe8be 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -324,13 +324,11 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,

if (!(old_man->flags & TTM_MEMTYPE_FLAG_FIXED) && !(new_man->flags & TTM_MEMTYPE_FLAG_FIXED))

• ret = ttm_bo_move_ttm(bo, ctx->interruptible,
  

• 		      ctx->no_wait_gpu, mem);
  

• ret = ttm_bo_move_ttm(bo, ctx, mem);
  

  else if (bdev->driver->move) ret = bdev->driver->move(bo, evict, ctx, mem); else

• ret = ttm_bo_move_memcpy(bo, ctx->interruptible,
  

• 			 ctx->no_wait_gpu, mem);
  

• ret = ttm_bo_move_memcpy(bo, ctx, mem);
  
  

  if (ret) { if (bdev->driver->move_notify) {

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index e7a519f..9237099 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -45,7 +45,7 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo) }

int ttm_bo_move_ttm(struct ttm_buffer_object *bo,

•     bool interruptible, bool no_wait_gpu,
  

•    struct ttm_operation_ctx *ctx,
  

  struct ttm_mem_reg *new_mem) { struct ttm_tt *ttm = bo->ttm;

@@ -53,7 +53,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, int ret;

if (old_mem->mem_type != TTM_PL_SYSTEM) {

• ret = ttm_bo_wait(bo, interruptible, no_wait_gpu);
  

• ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu);
  
  

  if (unlikely(ret != 0)) { if (ret != -ERESTARTSYS)

@@ -329,7 +329,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst, }

int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,

•        bool interruptible, bool no_wait_gpu,
  

•        struct ttm_operation_ctx *ctx,
    struct ttm_mem_reg *new_mem)
  

  { struct ttm_bo_device *bdev = bo->bdev;

@@ -345,7 +345,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, unsigned long add = 0; int dir;

• ret = ttm_bo_wait(bo, interruptible, no_wait_gpu);

• ret = ttm_bo_wait(bo, ctx->interruptible, ctx->no_wait_gpu); if (ret) return ret;

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 6996d88..5115718 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -976,7 +976,7 @@ void ttm_mem_io_free(struct ttm_bo_device *bdev, */

int ttm_bo_move_ttm(struct ttm_buffer_object *bo,

•     bool interruptible, bool no_wait_gpu,
  

•     struct ttm_operation_ctx *ctx,
  

  struct ttm_mem_reg *new_mem);

  /**

@@ -998,7 +998,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, */

int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,

•        bool interruptible, bool no_wait_gpu,
  

•        struct ttm_operation_ctx *ctx,
    struct ttm_mem_reg *new_mem);
  
  

  /**