diff mbox series

[04/10] drm/nouveau/ttm: plumb ctx through move functions.

Message ID 20200923030454.362731-5-airlied@gmail.com (mailing list archive)
State New, archived
Headers show
Series ttm driver cleanups and invert move | expand

Commit Message

Dave Airlie Sept. 23, 2020, 3:04 a.m. UTC 
From: Dave Airlie <airlied@redhat.com>

This just uses the ctx instead of passing bools and recreating it.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 48 +++++++++++++---------------
 1 file changed, 23 insertions(+), 25 deletions(-)

Comments

Christian König Sept. 23, 2020, 2:39 p.m. UTC | #1 
Am 23.09.20 um 05:04 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> This just uses the ctx instead of passing bools and recreating it.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>

Acked-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/nouveau/nouveau_bo.c | 48 +++++++++++++---------------
>   1 file changed, 23 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index bcae4514952f..8a90b07f17a4 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -772,8 +772,9 @@ nouveau_bo_move_prep(struct nouveau_drm *drm, struct ttm_buffer_object *bo,
>   }
>   
>   static int
> -nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
> -		     bool no_wait_gpu, struct ttm_resource *new_reg)
> +nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
> +		     struct ttm_operation_ctx *ctx,
> +		     struct ttm_resource *new_reg)
>   {
>   	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
>   	struct nouveau_channel *chan = drm->ttm.chan;
> @@ -792,7 +793,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
>   	}
>   
>   	mutex_lock_nested(&cli->mutex, SINGLE_DEPTH_NESTING);
> -	ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, intr);
> +	ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, ctx->interruptible);
>   	if (ret == 0) {
>   		ret = drm->ttm.move(chan, bo, &bo->mem, new_reg);
>   		if (ret == 0) {
> @@ -879,10 +880,10 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
>   }
>   
>   static int
> -nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
> -		      bool no_wait_gpu, struct ttm_resource *new_reg)
> +nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict,
> +		      struct ttm_operation_ctx *ctx,
> +		      struct ttm_resource *new_reg)
>   {
> -	struct ttm_operation_ctx ctx = { intr, no_wait_gpu };
>   	struct ttm_place placement_memtype = {
>   		.fpfn = 0,
>   		.lpfn = 0,
> @@ -898,11 +899,11 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
>   
>   	tmp_reg = *new_reg;
>   	tmp_reg.mm_node = NULL;
> -	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, &ctx);
> +	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
>   	if (ret)
>   		return ret;
>   
> -	ret = ttm_tt_populate(bo->bdev, bo->ttm, &ctx);
> +	ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
>   	if (ret)
>   		goto out;
>   
> @@ -910,21 +911,21 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
>   	if (ret)
>   		goto out;
>   
> -	ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, &tmp_reg);
> +	ret = nouveau_bo_move_m2mf(bo, true, ctx, &tmp_reg);
>   	if (ret)
>   		goto out;
>   
> -	ret = ttm_bo_move_ttm(bo, &ctx, new_reg);
> +	ret = ttm_bo_move_ttm(bo, ctx, new_reg);
>   out:
>   	ttm_resource_free(bo, &tmp_reg);
>   	return ret;
>   }
>   
>   static int
> -nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
> -		      bool no_wait_gpu, struct ttm_resource *new_reg)
> +nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict,
> +		      struct ttm_operation_ctx *ctx,
> +		      struct ttm_resource *new_reg)
>   {
> -	struct ttm_operation_ctx ctx = { intr, no_wait_gpu };
>   	struct ttm_place placement_memtype = {
>   		.fpfn = 0,
>   		.lpfn = 0,
> @@ -940,15 +941,15 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
>   
>   	tmp_reg = *new_reg;
>   	tmp_reg.mm_node = NULL;
> -	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, &ctx);
> +	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
>   	if (ret)
>   		return ret;
>   
> -	ret = ttm_bo_move_ttm(bo, &ctx, &tmp_reg);
> +	ret = ttm_bo_move_ttm(bo, ctx, &tmp_reg);
>   	if (ret)
>   		goto out;
>   
> -	ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, new_reg);
> +	ret = nouveau_bo_move_m2mf(bo, true, ctx, new_reg);
>   	if (ret)
>   		goto out;
>   
> @@ -1059,17 +1060,14 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
>   	/* Hardware assisted copy. */
>   	if (drm->ttm.move) {
>   		if (new_reg->mem_type == TTM_PL_SYSTEM)
> -			ret = nouveau_bo_move_flipd(bo, evict,
> -						    ctx->interruptible,
> -						    ctx->no_wait_gpu, new_reg);
> +			ret = nouveau_bo_move_flipd(bo, evict, ctx,
> +						    new_reg);
>   		else if (old_reg->mem_type == TTM_PL_SYSTEM)
> -			ret = nouveau_bo_move_flips(bo, evict,
> -						    ctx->interruptible,
> -						    ctx->no_wait_gpu, new_reg);
> +			ret = nouveau_bo_move_flips(bo, evict, ctx,
> +						    new_reg);
>   		else
> -			ret = nouveau_bo_move_m2mf(bo, evict,
> -						   ctx->interruptible,
> -						   ctx->no_wait_gpu, new_reg);
> +			ret = nouveau_bo_move_m2mf(bo, evict, ctx,
> +						   new_reg);
>   		if (!ret)
>   			goto out;
>   	}
diff mbox series

Patch

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index bcae4514952f..8a90b07f17a4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -772,8 +772,9 @@  nouveau_bo_move_prep(struct nouveau_drm *drm, struct ttm_buffer_object *bo,
 }
 
 static int
-nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
-		     bool no_wait_gpu, struct ttm_resource *new_reg)
+nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
+		     struct ttm_operation_ctx *ctx,
+		     struct ttm_resource *new_reg)
 {
 	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
 	struct nouveau_channel *chan = drm->ttm.chan;
@@ -792,7 +793,7 @@  nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
 	}
 
 	mutex_lock_nested(&cli->mutex, SINGLE_DEPTH_NESTING);
-	ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, intr);
+	ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, ctx->interruptible);
 	if (ret == 0) {
 		ret = drm->ttm.move(chan, bo, &bo->mem, new_reg);
 		if (ret == 0) {
@@ -879,10 +880,10 @@  nouveau_bo_move_init(struct nouveau_drm *drm)
 }
 
 static int
-nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
-		      bool no_wait_gpu, struct ttm_resource *new_reg)
+nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict,
+		      struct ttm_operation_ctx *ctx,
+		      struct ttm_resource *new_reg)
 {
-	struct ttm_operation_ctx ctx = { intr, no_wait_gpu };
 	struct ttm_place placement_memtype = {
 		.fpfn = 0,
 		.lpfn = 0,
@@ -898,11 +899,11 @@  nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
 
 	tmp_reg = *new_reg;
 	tmp_reg.mm_node = NULL;
-	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, &ctx);
+	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
 	if (ret)
 		return ret;
 
-	ret = ttm_tt_populate(bo->bdev, bo->ttm, &ctx);
+	ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
 	if (ret)
 		goto out;
 
@@ -910,21 +911,21 @@  nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
 	if (ret)
 		goto out;
 
-	ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, &tmp_reg);
+	ret = nouveau_bo_move_m2mf(bo, true, ctx, &tmp_reg);
 	if (ret)
 		goto out;
 
-	ret = ttm_bo_move_ttm(bo, &ctx, new_reg);
+	ret = ttm_bo_move_ttm(bo, ctx, new_reg);
 out:
 	ttm_resource_free(bo, &tmp_reg);
 	return ret;
 }
 
 static int
-nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
-		      bool no_wait_gpu, struct ttm_resource *new_reg)
+nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict,
+		      struct ttm_operation_ctx *ctx,
+		      struct ttm_resource *new_reg)
 {
-	struct ttm_operation_ctx ctx = { intr, no_wait_gpu };
 	struct ttm_place placement_memtype = {
 		.fpfn = 0,
 		.lpfn = 0,
@@ -940,15 +941,15 @@  nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
 
 	tmp_reg = *new_reg;
 	tmp_reg.mm_node = NULL;
-	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, &ctx);
+	ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
 	if (ret)
 		return ret;
 
-	ret = ttm_bo_move_ttm(bo, &ctx, &tmp_reg);
+	ret = ttm_bo_move_ttm(bo, ctx, &tmp_reg);
 	if (ret)
 		goto out;
 
-	ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, new_reg);
+	ret = nouveau_bo_move_m2mf(bo, true, ctx, new_reg);
 	if (ret)
 		goto out;
 
@@ -1059,17 +1060,14 @@  nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
 	/* Hardware assisted copy. */
 	if (drm->ttm.move) {
 		if (new_reg->mem_type == TTM_PL_SYSTEM)
-			ret = nouveau_bo_move_flipd(bo, evict,
-						    ctx->interruptible,
-						    ctx->no_wait_gpu, new_reg);
+			ret = nouveau_bo_move_flipd(bo, evict, ctx,
+						    new_reg);
 		else if (old_reg->mem_type == TTM_PL_SYSTEM)
-			ret = nouveau_bo_move_flips(bo, evict,
-						    ctx->interruptible,
-						    ctx->no_wait_gpu, new_reg);
+			ret = nouveau_bo_move_flips(bo, evict, ctx,
+						    new_reg);
 		else
-			ret = nouveau_bo_move_m2mf(bo, evict,
-						   ctx->interruptible,
-						   ctx->no_wait_gpu, new_reg);
+			ret = nouveau_bo_move_m2mf(bo, evict, ctx,
+						   new_reg);
 		if (!ret)
 			goto out;
 	}