[PATCH 1/3] drm/ttm: use an operation ctx for ttm_tt_bind

[Christian König]

Am 25.12.2017 um 07:07 schrieb Roger He:
> forward the operation context to ttm_tt_bind as well,
> and the ultimate goal is swapout enablement for reserved BOs.
>
> v2: use common term rather than amd specific
>
> Change-Id: I42a7df8c50e1ce3b527ee9cb78809f8e58136f07
> Signed-off-by: Roger He <Hongbo.He at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
>   drivers/gpu/drm/nouveau/nouveau_bo.c    | 2 +-
>   drivers/gpu/drm/radeon/radeon_ttm.c     | 2 +-
>   drivers/gpu/drm/ttm/ttm_bo.c            | 2 +-
>   drivers/gpu/drm/ttm/ttm_bo_util.c       | 2 +-
>   drivers/gpu/drm/ttm/ttm_tt.c            | 9 +++------
>   include/drm/ttm/ttm_bo_driver.h         | 3 ++-
>   7 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 044f5b5..e4bb435 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -497,7 +497,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
>   		goto out_cleanup;
>   	}
>   
> -	r = ttm_tt_bind(bo->ttm, &tmp_mem);
> +	r = ttm_tt_bind(bo->ttm, &tmp_mem, ctx);
>   	if (unlikely(r)) {
>   		goto out_cleanup;
>   	}
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index b141c27..a83ba6a 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -1218,7 +1218,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
>   	if (ret)
>   		return ret;
>   
> -	ret = ttm_tt_bind(bo->ttm, &tmp_reg);
> +	ret = ttm_tt_bind(bo->ttm, &tmp_reg, &ctx);
>   	if (ret)
>   		goto out;
>   
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 9424b81..2b74ba1b 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -339,7 +339,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
>   		goto out_cleanup;
>   	}
>   
> -	r = ttm_tt_bind(bo->ttm, &tmp_mem);
> +	r = ttm_tt_bind(bo->ttm, &tmp_mem, &ctx);
>   	if (unlikely(r)) {
>   		goto out_cleanup;
>   	}
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index c59f572..e7595b4 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -300,7 +300,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
>   			goto out_err;
>   
>   		if (mem->mem_type != TTM_PL_SYSTEM) {
> -			ret = ttm_tt_bind(bo->ttm, mem);
> +			ret = ttm_tt_bind(bo->ttm, mem, ctx);
>   			if (ret)
>   				goto out_err;
>   		}
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index b7eb507..153de1b 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -73,7 +73,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
>   		return ret;
>   
>   	if (new_mem->mem_type != TTM_PL_SYSTEM) {
> -		ret = ttm_tt_bind(ttm, new_mem);
> +		ret = ttm_tt_bind(ttm, new_mem, ctx);
>   		if (unlikely(ret != 0))
>   			return ret;
>   	}
> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
> index b48d7a0..5a046a3 100644
> --- a/drivers/gpu/drm/ttm/ttm_tt.c
> +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> @@ -261,12 +261,9 @@ void ttm_tt_unbind(struct ttm_tt *ttm)
>   	}
>   }
>   
> -int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)
> +int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem,
> +		struct ttm_operation_ctx *ctx)
>   {
> -	struct ttm_operation_ctx ctx = {
> -		.interruptible = false,
> -		.no_wait_gpu = false
> -	};
>   	int ret = 0;
>   
>   	if (!ttm)
> @@ -275,7 +272,7 @@ int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem)
>   	if (ttm->state == tt_bound)
>   		return 0;
>   
> -	ret = ttm->bdev->driver->ttm_tt_populate(ttm, &ctx);
> +	ret = ttm->bdev->driver->ttm_tt_populate(ttm, ctx);
>   	if (ret)
>   		return ret;
>   
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 84860ec..94064b1 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -650,7 +650,8 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);
>    *
>    * Bind the pages of @ttm to an aperture location identified by @bo_mem
>    */
> -int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem);
> +int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem,
> +		struct ttm_operation_ctx *ctx);
>   
>   /**
>    * ttm_ttm_destroy: