Skip to contentSkip to conversation

ttm follow-on cleanups

PATCH In review Dave Airlie 2 participants 5 messages Sep 17, 2020

Subsystems (5)
lore
Share & tools
lore
author maintainer
#1 lore raw

PATCH 1/2 drm/ttm: drop special pipeline accel cleanup function.

From: Dave Airlie <[email protected]>

The two accel cleanup paths were mostly the same once refactored.

Just pass a bool to say if the evictions are to be pipelined.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c |  5 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c    |  2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c     |  2 +-
 drivers/gpu/drm/ttm/ttm_bo_util.c       | 89 +++++++++----------------
 include/drm/ttm/ttm_bo_driver.h         | 17 +----
 5 files changed, 37 insertions(+), 78 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -4
index a57aaf666340..1ea58ce7c559 100644
@@ -499,10 +499,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
 	}
 
 	/* Always block for VM page tables before committing the new location */
-	if (bo->type == ttm_bo_type_kernel)
-		r = ttm_bo_move_accel_cleanup(bo, fence, true, new_mem);
-	else
-		r = ttm_bo_pipeline_move(bo, fence, evict, new_mem);
+	r = ttm_bo_move_accel_cleanup(bo, fence, true, bo->type != ttm_bo_type_kernel, new_mem);
 	dma_fence_put(fence);
 	return r;
 
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -1
index 56f974c28eb5..2ee75646ad6f 100644
@@ -824,7 +824,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
 			if (ret == 0) {
 				ret = ttm_bo_move_accel_cleanup(bo,
 								&fence->base,
-								evict,
+								evict, false,
 								new_reg);
 				nouveau_fence_unref(&fence);
 			}
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
index 99d9ca1087b7..36150b7f31a9 100644
@@ -200,7 +200,7 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
 	if (IS_ERR(fence))
 		return PTR_ERR(fence);
 
-	r = ttm_bo_move_accel_cleanup(bo, &fence->base, evict, new_mem);
+	r = ttm_bo_move_accel_cleanup(bo, &fence->base, evict, false, new_mem);
 	radeon_fence_unref(&fence);
 	return r;
 }
drivers/gpu/drm/ttm/ttm_bo_util.c +32 -57

113 lines not on this page · raw message

include/drm/ttm/ttm_bo_driver.h +2 -15
index 25cc932d63f1..864afa8f6f18 100644
@@ -642,6 +642,7 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
  * @bo: A pointer to a struct ttm_buffer_object.
  * @fence: A fence object that signals when moving is complete.
  * @evict: This is an evict move. Don't return until the buffer is idle.
+ * @pipeline: evictions are to be pipelined.
  * @new_mem: struct ttm_resource indicating where to move.
  *
  * Accelerated move function to be called when an accelerated move
@@ -653,23 +654,9 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
  */
 int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
 			      struct dma_fence *fence, bool evict,
+			      bool pipeline,
 			      struct ttm_resource *new_mem);
 
-/**
- * ttm_bo_pipeline_move.
- *
- * @bo: A pointer to a struct ttm_buffer_object.
- * @fence: A fence object that signals when moving is complete.
- * @evict: This is an evict move. Don't return until the buffer is idle.
- * @new_mem: struct ttm_resource indicating where to move.
- *
- * Function for pipelining accelerated moves. Either free the memory
- * immediately or hang it on a temporary buffer object.
- */
-int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
-			 struct dma_fence *fence, bool evict,
-			 struct ttm_resource *new_mem);
-
 /**
  * ttm_bo_pipeline_gutting.
  *
Signature · 6 lines
2.27.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#3 lore raw

PATCH 2/2 drm/ttm: drop evicted from ttm_bo.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This was unused.

---
 drivers/gpu/drm/ttm/ttm_bo.c | 4 ----
 include/drm/ttm/ttm_bo_api.h | 1 -
 2 files changed, 5 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +0 -4
index 279a0e44a5ed..7562b0844c75 100644
@@ -298,8 +298,6 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
 	}
 
 moved:
-	bo->evicted = false;
-
 	ctx->bytes_moved += bo->num_pages << PAGE_SHIFT;
 	return 0;
 
@@ -638,9 +636,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo,
 		if (ret != -ERESTARTSYS)
 			pr_err("Buffer eviction failed\n");
 		ttm_resource_free(bo, &evict_mem);
-		goto out;
 	}
-	bo->evicted = true;
 out:
 	return ret;
 }
include/drm/ttm/ttm_bo_api.h +0 -1
index 36ff64e2736c..03b4761a3ea3 100644
@@ -141,7 +141,6 @@ struct ttm_buffer_object {
 	struct ttm_resource mem;
 	struct file *persistent_swap_storage;
 	struct ttm_tt *ttm;
-	bool evicted;
 	bool deleted;
 
 	/**
Signature · 6 lines
2.27.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer
#2 lore raw

Re: [PATCH 1/2] drm/ttm: drop special pipeline accel cleanup function.

In reply to Dave Airlie

Am 17.09.20 um 08:41 schrieb Dave Airlie:

Quoted 20 lines

From: Dave Airlie <[email protected]>

The two accel cleanup paths were mostly the same once refactored.

Just pass a bool to say if the evictions are to be pipelined.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c |  5 +-
  drivers/gpu/drm/nouveau/nouveau_bo.c    |  2 +-
  drivers/gpu/drm/radeon/radeon_ttm.c     |  2 +-
  drivers/gpu/drm/ttm/ttm_bo_util.c       | 89 +++++++++----------------
  include/drm/ttm/ttm_bo_driver.h         | 17 +----
  5 files changed, 37 insertions(+), 78 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -0
index a57aaf666340..1ea58ce7c559 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static int amdgpu_move_blit(struct ttm_buffer_object *bo, · line 502

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -4
@@ -499,10 +499,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
  	}
 
  	/* Always block for VM page tables before committing the new location */
-	if (bo->type == ttm_bo_type_kernel)
-		r = ttm_bo_move_accel_cleanup(bo, fence, true, new_mem);
-	else
-		r = ttm_bo_pipeline_move(bo, fence, evict, new_mem);
+	r = ttm_bo_move_accel_cleanup(bo, fence, true, bo->type != ttm_bo_type_kernel, new_mem);

You are now passing evict as always true here. I would keep the if instead.

Apart from that looks good to me,
Christian.

Quoted 174 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -0
  	dma_fence_put(fence);
  	return r;
 
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -1
index 56f974c28eb5..2ee75646ad6f 100644
@@ -824,7 +824,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
  			if (ret == 0) {
  				ret = ttm_bo_move_accel_cleanup(bo,
  								&fence->base,
-								evict,
+								evict, false,
  								new_reg);
  				nouveau_fence_unref(&fence);
  			}
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
index 99d9ca1087b7..36150b7f31a9 100644
@@ -200,7 +200,7 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
  	if (IS_ERR(fence))
  		return PTR_ERR(fence);
 
-	r = ttm_bo_move_accel_cleanup(bo, &fence->base, evict, new_mem);
+	r = ttm_bo_move_accel_cleanup(bo, &fence->base, evict, false, new_mem);
  	radeon_fence_unref(&fence);
  	return r;
  }
drivers/gpu/drm/ttm/ttm_bo_util.c +32 -57
index 502d334786d2..777f843cdb98 100644
@@ -581,81 +581,56 @@ static int ttm_bo_move_to_ghost(struct ttm_buffer_object *bo,
  	return 0;
  }
 
-int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
-			      struct dma_fence *fence,
-			      bool evict,
-			      struct ttm_resource *new_mem)
+static void ttm_bo_move_pipeline_evict(struct ttm_buffer_object *bo,
+				       struct dma_fence *fence)
  {
  	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
-	int ret;
+	struct ttm_resource_manager *from = ttm_manager_type(bdev, bo->mem.mem_type);
 
-	dma_resv_add_excl_fence(bo->base.resv, fence);
-	if (evict)
-		ret = ttm_bo_wait_free_node(bo, man->use_tt);
-	else
-		ret = ttm_bo_move_to_ghost(bo, fence, man->use_tt);
-	if (ret)
-		return ret;
+	/**
+	 * BO doesn't have a TTM we need to bind/unbind. Just remember
+	 * this eviction and free up the allocation
+	 */
+	spin_lock(&from->move_lock);
+	if (!from->move || dma_fence_is_later(fence, from->move)) {
+		dma_fence_put(from->move);
+		from->move = dma_fence_get(fence);
+	}
+	spin_unlock(&from->move_lock);
 
-	ttm_bo_assign_mem(bo, new_mem);
+	ttm_bo_free_old_node(bo);
 
-	return 0;
+	dma_fence_put(bo->moving);
+	bo->moving = dma_fence_get(fence);
  }
-EXPORT_SYMBOL(ttm_bo_move_accel_cleanup);
 
-int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
-			 struct dma_fence *fence, bool evict,
-			 struct ttm_resource *new_mem)
+int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
+			      struct dma_fence *fence,
+			      bool evict,
+			      bool pipeline,
+			      struct ttm_resource *new_mem)
  {
  	struct ttm_bo_device *bdev = bo->bdev;
-
  	struct ttm_resource_manager *from = ttm_manager_type(bdev, bo->mem.mem_type);
-	struct ttm_resource_manager *to = ttm_manager_type(bdev, new_mem->mem_type);
-
-	int ret;
+	struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
+	int ret = 0;
 
  	dma_resv_add_excl_fence(bo->base.resv, fence);
+	if (!evict)
+		ret = ttm_bo_move_to_ghost(bo, fence, man->use_tt);
+	else if (!from->use_tt && pipeline)
+		ttm_bo_move_pipeline_evict(bo, fence);
+	else
+		ret = ttm_bo_wait_free_node(bo, man->use_tt);
 
-	if (!evict) {
-		ret = ttm_bo_move_to_ghost(bo, fence, to->use_tt);
-		if (ret)
-			return ret;
-	} else if (!from->use_tt) {
-
-		/**
-		 * BO doesn't have a TTM we need to bind/unbind. Just remember
-		 * this eviction and free up the allocation
-		 */
-
-		spin_lock(&from->move_lock);
-		if (!from->move || dma_fence_is_later(fence, from->move)) {
-			dma_fence_put(from->move);
-			from->move = dma_fence_get(fence);
-		}
-		spin_unlock(&from->move_lock);
-
-		ttm_bo_free_old_node(bo);
-
-		dma_fence_put(bo->moving);
-		bo->moving = dma_fence_get(fence);
-
-	} else {
-		/**
-		 * Last resort, wait for the move to be completed.
-		 *
-		 * Should never happen in pratice.
-		 */
-		ret = ttm_bo_wait_free_node(bo, to->use_tt);
-		if (ret)
-			return ret;
-	}
+	if (ret)
+		return ret;
 
  	ttm_bo_assign_mem(bo, new_mem);
 
  	return 0;
  }
-EXPORT_SYMBOL(ttm_bo_pipeline_move);
+EXPORT_SYMBOL(ttm_bo_move_accel_cleanup);
 
  int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
  {
include/drm/ttm/ttm_bo_driver.h +2 -8
index 25cc932d63f1..864afa8f6f18 100644
@@ -642,6 +642,7 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
   * @bo: A pointer to a struct ttm_buffer_object.
   * @fence: A fence object that signals when moving is complete.
   * @evict: This is an evict move. Don't return until the buffer is idle.
+ * @pipeline: evictions are to be pipelined.
   * @new_mem: struct ttm_resource indicating where to move.
   *
   * Accelerated move function to be called when an accelerated move
@@ -653,23 +654,9 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
   */
  int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
  			      struct dma_fence *fence, bool evict,
+			      bool pipeline,
  			      struct ttm_resource *new_mem);
 
-/**
- * ttm_bo_pipeline_move.
- *
- * @bo: A pointer to a struct ttm_buffer_object.
- * @fence: A fence object that signals when moving is complete.
- * @evict: This is an evict move. Don't return until the buffer is idle.
- * @new_mem: struct ttm_resource indicating where to move.
- *

include/drm/ttm/ttm_bo_driver.h void ttm_bo_free_old_node(struct ttm_buffer_object *bo); · line 662

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +0 -7
- * Function for pipelining accelerated moves. Either free the memory
- * immediately or hang it on a temporary buffer object.
- */
-int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
-			 struct dma_fence *fence, bool evict,
-			 struct ttm_resource *new_mem);
-
  /**
   * ttm_bo_pipeline_gutting.
   *

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] drm/ttm: drop evicted from ttm_bo.

In reply to Dave Airlie

Am 17.09.20 um 08:41 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

This was unused.

Quoted 33 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c | 4 ----
  include/drm/ttm/ttm_bo_api.h | 1 -
  2 files changed, 5 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +0 -4
index 279a0e44a5ed..7562b0844c75 100644
@@ -298,8 +298,6 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
  	}
 
  moved:
-	bo->evicted = false;
-
  	ctx->bytes_moved += bo->num_pages << PAGE_SHIFT;
  	return 0;
 
@@ -638,9 +636,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo,
  		if (ret != -ERESTARTSYS)
  			pr_err("Buffer eviction failed\n");
  		ttm_resource_free(bo, &evict_mem);
-		goto out;
  	}
-	bo->evicted = true;
  out:
  	return ret;
  }
include/drm/ttm/ttm_bo_api.h +0 -0
index 36ff64e2736c..03b4761a3ea3 100644

include/drm/ttm/ttm_bo_api.h struct ttm_buffer_object { · line 146

Quoted 7 lines
include/drm/ttm/ttm_bo_api.h +0 -1
@@ -141,7 +141,6 @@ struct ttm_buffer_object {
  	struct ttm_resource mem;
  	struct file *persistent_swap_storage;
  	struct ttm_tt *ttm;
-	bool evicted;
  	bool deleted;
 
  	/**

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel