Skip to contentSkip to conversation

ttm misc cleanups, mem refactoring, rename objects. (v2)

PATCH In review Dave Airlie 6 participants 136 messages Aug 4, 2020 – Aug 5, 2020 Page 1 of 2

Subsystems (8)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

cover ttm misc cleanups, mem refactoring, rename objects. (v2)

I've decided to repost the whole queue this time, it has a few driver patches up front that are just cleanups.

I've reorodered things a little since the first posting, but not much.

misc core/driver cleanups
mem type manager debug callback cleanup (reordered) new mem type manager init path
new mem type manager cleanup path
new wrapper to access managers
driver managed mem type allocations
cleanup after all of that
rename ttm_bo_manager to ttm_range_manager (new) rename ttm_mem_type_manager to ttm_resource_manager (new) rename ttm_mem_reg to ttm_resource (new)

I've marked most things with v2 that have changed, again I'd really like to land this in drm-misc sooner rather than later, so it would be good to get driver acks from qxl, vmwgfx and nouveau. (all cc'ed).

I've also commented on the list on any outstanding comments from previous review that I disagree with or need more discussion.

Dave.

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

author maintainer
#1 lore raw

PATCH 1/59 drm/vmwgfx: consolidate ttm object creation and populate

From: Dave Airlie <[email protected]>

These two functions has the same code in them, create a common helper function instead.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h        |  4 ++
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c        | 60 ++--------------------
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 32 ++++++++++++
 3 files changed, 39 insertions(+), 57 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +4 -0
index 3596f3923ea3..b7c763713b4c 100644
@@ -1023,6 +1023,10 @@ extern int vmw_bo_map_dma(struct ttm_buffer_object *bo);
 extern void vmw_bo_unmap_dma(struct ttm_buffer_object *bo);
 extern const struct vmw_sg_table *
 vmw_bo_sg_table(struct ttm_buffer_object *bo);
+extern int vmw_bo_create_and_populate(struct vmw_private *dev_priv,
+				      unsigned long bo_size,
+				      struct ttm_buffer_object **bo_p);
+
 extern void vmw_piter_start(struct vmw_piter *viter,
 			    const struct vmw_sg_table *vsgt,
 			    unsigned long p_offs);
drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +3 -57

93 lines not on this page · raw message

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +32 -0
index 2deaaed334e6..8e2a82ded900 100644
@@ -817,3 +817,35 @@ struct ttm_bo_driver vmw_bo_driver = {
 	.swap_notify = vmw_swap_notify,
 	.io_mem_reserve = &vmw_ttm_io_mem_reserve,
 };
+
+int vmw_bo_create_and_populate(struct vmw_private *dev_priv,
+			       unsigned long bo_size,
+			       struct ttm_buffer_object **bo_p)
+{
+	struct ttm_operation_ctx ctx = {
+		.interruptible = false,
+		.no_wait_gpu = false
+	};
+	struct ttm_buffer_object *bo;
+	int ret;
+
+	ret = ttm_bo_create(&dev_priv->bdev, bo_size,
+			    ttm_bo_type_device,
+			    &vmw_sys_ne_placement,
+			    0, false, &bo);
+
+	if (unlikely(ret != 0))
+		return ret;
+
+	ret = ttm_bo_reserve(bo, false, true, NULL);
+	BUG_ON(ret != 0);
+	ret = vmw_bo_driver.ttm_tt_populate(bo->ttm, &ctx);
+	if (likely(ret == 0))
+		ret = vmw_bo_map_dma(bo);
+
+	ttm_bo_unreserve(bo);
+
+	if (likely(ret == 0))
+		*bo_p = bo;
+	return ret;
+}
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 1/59
#2 lore raw

Re: [PATCH 01/59] drm/vmwgfx: consolidate ttm object creation and populate

Quoted 159 lines · Dave Airlie

From: Dave Airlie <[email protected]>

These two functions has the same code in them, create a common helper function instead.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h        |  4 ++
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c        | 60 ++--------------------
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 32 ++++++++++++
 3 files changed, 39 insertions(+), 57 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +4 -0
index 3596f3923ea3..b7c763713b4c 100644
@@ -1023,6 +1023,10 @@ extern int vmw_bo_map_dma(struct ttm_buffer_object *bo);
 extern void vmw_bo_unmap_dma(struct ttm_buffer_object *bo);
 extern const struct vmw_sg_table *
 vmw_bo_sg_table(struct ttm_buffer_object *bo);
+extern int vmw_bo_create_and_populate(struct vmw_private *dev_priv,
+				      unsigned long bo_size,
+				      struct ttm_buffer_object **bo_p);
+
 extern void vmw_piter_start(struct vmw_piter *viter,
 			    const struct vmw_sg_table *vsgt,
 			    unsigned long p_offs);
drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +3 -57
index e8eb42933ca2..7f95ed6aa224 100644
@@ -238,10 +238,6 @@ static int vmw_otable_batch_setup(struct vmw_private *dev_priv,
 	unsigned long offset;
 	unsigned long bo_size;
 	struct vmw_otable *otables = batch->otables;
-	struct ttm_operation_ctx ctx = {
-		.interruptible = false,
-		.no_wait_gpu = false
-	};
 	SVGAOTableType i;
 	int ret;
 
@@ -255,24 +251,9 @@ static int vmw_otable_batch_setup(struct vmw_private *dev_priv,
 		bo_size += otables[i].size;
 	}
 
-	ret = ttm_bo_create(&dev_priv->bdev, bo_size,
-			    ttm_bo_type_device,
-			    &vmw_sys_ne_placement,
-			    0, false, &batch->otable_bo);
-
-	if (unlikely(ret != 0))
-		goto out_no_bo;
-
-	ret = ttm_bo_reserve(batch->otable_bo, false, true, NULL);
-	BUG_ON(ret != 0);
-	ret = vmw_bo_driver.ttm_tt_populate(batch->otable_bo->ttm, &ctx);
-	if (unlikely(ret != 0))
-		goto out_unreserve;
-	ret = vmw_bo_map_dma(batch->otable_bo);
+	ret = vmw_bo_create_and_populate(dev_priv, bo_size, &batch->otable_bo);
 	if (unlikely(ret != 0))
-		goto out_unreserve;
-
-	ttm_bo_unreserve(batch->otable_bo);
+		return ret;
 
 	offset = 0;
 	for (i = 0; i < batch->num_otables; ++i) {
@@ -289,8 +270,6 @@ static int vmw_otable_batch_setup(struct vmw_private *dev_priv,
 
 	return 0;
 
-out_unreserve:
-	ttm_bo_unreserve(batch->otable_bo);
 out_no_setup:
 	for (i = 0; i < batch->num_otables; ++i) {
 		if (batch->otables[i].enabled)
@@ -300,7 +279,6 @@ static int vmw_otable_batch_setup(struct vmw_private *dev_priv,
 
 	ttm_bo_put(batch->otable_bo);
 	batch->otable_bo = NULL;
-out_no_bo:
 	return ret;
 }
 
@@ -432,41 +410,9 @@ struct vmw_mob *vmw_mob_create(unsigned long data_pages)
 static int vmw_mob_pt_populate(struct vmw_private *dev_priv,
 			       struct vmw_mob *mob)
 {
-	int ret;
-	struct ttm_operation_ctx ctx = {
-		.interruptible = false,
-		.no_wait_gpu = false
-	};
-
 	BUG_ON(mob->pt_bo != NULL);
 
-	ret = ttm_bo_create(&dev_priv->bdev, mob->num_pages * PAGE_SIZE,
-			    ttm_bo_type_device,
-			    &vmw_sys_ne_placement,
-			    0, false, &mob->pt_bo);
-	if (unlikely(ret != 0))
-		return ret;
-
-	ret = ttm_bo_reserve(mob->pt_bo, false, true, NULL);
-
-	BUG_ON(ret != 0);
-	ret = vmw_bo_driver.ttm_tt_populate(mob->pt_bo->ttm, &ctx);
-	if (unlikely(ret != 0))
-		goto out_unreserve;
-	ret = vmw_bo_map_dma(mob->pt_bo);
-	if (unlikely(ret != 0))
-		goto out_unreserve;
-
-	ttm_bo_unreserve(mob->pt_bo);
-
-	return 0;
-
-out_unreserve:
-	ttm_bo_unreserve(mob->pt_bo);
-	ttm_bo_put(mob->pt_bo);
-	mob->pt_bo = NULL;
-
-	return ret;
+	return vmw_bo_create_and_populate(dev_priv, mob->num_pages * PAGE_SIZE, &mob->pt_bo);
 }
 
 /**
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +22 -0
index 2deaaed334e6..8e2a82ded900 100644
@@ -817,3 +817,35 @@ struct ttm_bo_driver vmw_bo_driver = {
 	.swap_notify = vmw_swap_notify,
 	.io_mem_reserve = &vmw_ttm_io_mem_reserve,
 };
+
+int vmw_bo_create_and_populate(struct vmw_private *dev_priv,
+			       unsigned long bo_size,
+			       struct ttm_buffer_object **bo_p)
+{
+	struct ttm_operation_ctx ctx = {
+		.interruptible = false,
+		.no_wait_gpu = false
+	};
+	struct ttm_buffer_object *bo;
+	int ret;
+
+	ret = ttm_bo_create(&dev_priv->bdev, bo_size,
+			    ttm_bo_type_device,
+			    &vmw_sys_ne_placement,
+			    0, false, &bo);
+
+	if (unlikely(ret != 0))
+		return ret;
+
+	ret = ttm_bo_reserve(bo, false, true, NULL);
+	BUG_ON(ret != 0);

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c struct ttm_bo_driver vmw_bo_driver = { · line 851

Quoted 10 lines
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +10 -0
+	ret = vmw_bo_driver.ttm_tt_populate(bo->ttm, &ctx);
+	if (likely(ret == 0))
+		ret = vmw_bo_map_dma(bo);
+
+	ttm_bo_unreserve(bo);
+
+	if (likely(ret == 0))
+		*bo_p = bo;
+	return ret;
+}
Quoted 7 lines
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#3 lore raw

PATCH 2/59 drm/vmwgfx: drop bo map/unmap dma functions.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

The map one was used once, just inline it, and drop them both.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h        |  2 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 46 +++-------------------
 2 files changed, 6 insertions(+), 42 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +0 -2
index b7c763713b4c..65c414f119c0 100644
@@ -1019,8 +1019,6 @@ extern struct ttm_placement vmw_mob_placement;
 extern struct ttm_placement vmw_mob_ne_placement;
 extern struct ttm_placement vmw_nonfixed_placement;
 extern struct ttm_bo_driver vmw_bo_driver;
-extern int vmw_bo_map_dma(struct ttm_buffer_object *bo);
-extern void vmw_bo_unmap_dma(struct ttm_buffer_object *bo);
 extern const struct vmw_sg_table *
 vmw_bo_sg_table(struct ttm_buffer_object *bo);
 extern int vmw_bo_create_and_populate(struct vmw_private *dev_priv,
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +6 -40

58 lines not on this page · raw message

Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 2/59
#4 lore raw

Re: [PATCH 02/59] drm/vmwgfx: drop bo map/unmap dma functions.

Quoted 72 lines · Dave Airlie

From: Dave Airlie <[email protected]>

The map one was used once, just inline it, and drop them both.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h        |  2 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 46 +++-------------------
 2 files changed, 6 insertions(+), 42 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +0 -2
index b7c763713b4c..65c414f119c0 100644
@@ -1019,8 +1019,6 @@ extern struct ttm_placement vmw_mob_placement;
 extern struct ttm_placement vmw_mob_ne_placement;
 extern struct ttm_placement vmw_nonfixed_placement;
 extern struct ttm_bo_driver vmw_bo_driver;
-extern int vmw_bo_map_dma(struct ttm_buffer_object *bo);
-extern void vmw_bo_unmap_dma(struct ttm_buffer_object *bo);
 extern const struct vmw_sg_table *
 vmw_bo_sg_table(struct ttm_buffer_object *bo);
 extern int vmw_bo_create_and_populate(struct vmw_private *dev_priv,
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +0 -37
index 8e2a82ded900..3a141a08d4bd 100644
@@ -519,43 +519,6 @@ static void vmw_ttm_unmap_dma(struct vmw_ttm_tt *vmw_tt)
 	vmw_tt->mapped = false;
 }
 
-
-/**
- * vmw_bo_map_dma - Make sure buffer object pages are visible to the device
- *
- * @bo: Pointer to a struct ttm_buffer_object
- *
- * Wrapper around vmw_ttm_map_dma, that takes a TTM buffer object pointer
- * instead of a pointer to a struct vmw_ttm_backend as argument.
- * Note that the buffer object must be either pinned or reserved before
- * calling this function.
- */
-int vmw_bo_map_dma(struct ttm_buffer_object *bo)
-{
-	struct vmw_ttm_tt *vmw_tt =
-		container_of(bo->ttm, struct vmw_ttm_tt, dma_ttm.ttm);
-
-	return vmw_ttm_map_dma(vmw_tt);
-}
-
-
-/**
- * vmw_bo_unmap_dma - Make sure buffer object pages are visible to the device
- *
- * @bo: Pointer to a struct ttm_buffer_object
- *
- * Wrapper around vmw_ttm_unmap_dma, that takes a TTM buffer object pointer
- * instead of a pointer to a struct vmw_ttm_backend as argument.
- */
-void vmw_bo_unmap_dma(struct ttm_buffer_object *bo)
-{
-	struct vmw_ttm_tt *vmw_tt =
-		container_of(bo->ttm, struct vmw_ttm_tt, dma_ttm.ttm);
-
-	vmw_ttm_unmap_dma(vmw_tt);
-}
-
-
 /**
  * vmw_bo_sg_table - Return a struct vmw_sg_table object for a
  * TTM buffer object

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c int vmw_bo_create_and_populate(struct vmw_private *dev_priv, · line 805

Quoted 7 lines
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +1 -3
@@ -839,9 +802,12 @@ int vmw_bo_create_and_populate(struct vmw_private *dev_priv,
 
 	ret = ttm_bo_reserve(bo, false, true, NULL);
 	BUG_ON(ret != 0);
-	ret = vmw_bo_driver.ttm_tt_populate(bo->ttm, &ctx);
-	if (likely(ret == 0))
-		ret = vmw_bo_map_dma(bo);
+	ret = vmw_ttm_populate(bo->ttm, &ctx);

Snuck a replacement for a vfunc call with a direct all in here, maybe mention that in the commit message.

Quoted 15 lines
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +5 -0
+	if (likely(ret == 0)) {
+		struct vmw_ttm_tt *vmw_tt =
+			container_of(bo->ttm, struct vmw_ttm_tt, dma_ttm.ttm);
+		ret = vmw_ttm_map_dma(vmw_tt);
+	}
 
 	ttm_bo_unreserve(bo);
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#5 lore raw

PATCH 3/59 nouveau: use ttm populate mapping functions. (v2)

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Instead of rolling driver copies of them.

v2: cleanup return handling (Ben)

---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 38 ++--------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -36
index 356c1aae327d..aebec45b8416 100644
@@ -1171,8 +1171,6 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
 	struct ttm_dma_tt *ttm_dma = (void *)ttm;
 	struct nouveau_drm *drm;
 	struct device *dev;
-	unsigned i;
-	int r;
 	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
 
 	if (ttm->state != tt_unpopulated)
@@ -1200,31 +1198,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
 		return ttm_dma_populate((void *)ttm, dev, ctx);
 	}
 #endif
-
-	r = ttm_pool_populate(ttm, ctx);
-	if (r) {
-		return r;
-	}
-
-	for (i = 0; i < ttm->num_pages; i++) {
-		dma_addr_t addr;
-
-		addr = dma_map_page(dev, ttm->pages[i], 0, PAGE_SIZE,
-				    DMA_BIDIRECTIONAL);
-
-		if (dma_mapping_error(dev, addr)) {
-			while (i--) {
-				dma_unmap_page(dev, ttm_dma->dma_address[i],
-					       PAGE_SIZE, DMA_BIDIRECTIONAL);
-				ttm_dma->dma_address[i] = 0;
-			}
-			ttm_pool_unpopulate(ttm);
-			return -EFAULT;
-		}
-
-		ttm_dma->dma_address[i] = addr;
-	}
-	return 0;
+	return ttm_populate_and_map_pages(dev, ttm_dma, ctx);
 }
 
 static void
@@ -1233,7 +1207,6 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
 	struct ttm_dma_tt *ttm_dma = (void *)ttm;
 	struct nouveau_drm *drm;
 	struct device *dev;
-	unsigned i;
 	bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
 
 	if (slave)
@@ -1256,14 +1229,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
 	}
 #endif
 
-	for (i = 0; i < ttm->num_pages; i++) {
-		if (ttm_dma->dma_address[i]) {
-			dma_unmap_page(dev, ttm_dma->dma_address[i], PAGE_SIZE,
-				       DMA_BIDIRECTIONAL);
-		}
-	}
-
-	ttm_pool_unpopulate(ttm);
+	ttm_unmap_and_unpopulate_pages(dev, ttm_dma);
 }
 
 void
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 3/59
#6 lore raw

Re: [PATCH 03/59] nouveau: use ttm populate mapping functions. (v2)

Quoted 7 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Instead of rolling driver copies of them.

v2: cleanup return handling (Ben)

Quoted 77 lines
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 38 ++--------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -37
index 356c1aae327d..aebec45b8416 100644
@@ -1171,8 +1171,6 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
        struct ttm_dma_tt *ttm_dma = (void *)ttm;
        struct nouveau_drm *drm;
        struct device *dev;
-       unsigned i;
-       int r;
        bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
 
        if (ttm->state != tt_unpopulated)
@@ -1200,31 +1198,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
                return ttm_dma_populate((void *)ttm, dev, ctx);
        }
 #endif
-
-       r = ttm_pool_populate(ttm, ctx);
-       if (r) {
-               return r;
-       }
-
-       for (i = 0; i < ttm->num_pages; i++) {
-               dma_addr_t addr;
-
-               addr = dma_map_page(dev, ttm->pages[i], 0, PAGE_SIZE,
-                                   DMA_BIDIRECTIONAL);
-
-               if (dma_mapping_error(dev, addr)) {
-                       while (i--) {
-                               dma_unmap_page(dev, ttm_dma->dma_address[i],
-                                              PAGE_SIZE, DMA_BIDIRECTIONAL);
-                               ttm_dma->dma_address[i] = 0;
-                       }
-                       ttm_pool_unpopulate(ttm);
-                       return -EFAULT;
-               }
-
-               ttm_dma->dma_address[i] = addr;
-       }
-       return 0;
+       return ttm_populate_and_map_pages(dev, ttm_dma, ctx);
 }
 
 static void
@@ -1233,7 +1207,6 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
        struct ttm_dma_tt *ttm_dma = (void *)ttm;
        struct nouveau_drm *drm;
        struct device *dev;
-       unsigned i;
        bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);
 
        if (slave)
@@ -1256,14 +1229,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
        }
 #endif
 
-       for (i = 0; i < ttm->num_pages; i++) {
-               if (ttm_dma->dma_address[i]) {
-                       dma_unmap_page(dev, ttm_dma->dma_address[i], PAGE_SIZE,
-                                      DMA_BIDIRECTIONAL);
-               }
-       }
-
-       ttm_pool_unpopulate(ttm);
+       ttm_unmap_and_unpopulate_pages(dev, ttm_dma);
 }
 
 void
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#7 lore raw

PATCH 4/59 qxl/ttm: drop the unusued no wait flag to reserve function

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/qxl/qxl_cmd.c    | 2 +-
 drivers/gpu/drm/qxl/qxl_ioctl.c  | 2 +-
 drivers/gpu/drm/qxl/qxl_object.c | 4 ++--
 drivers/gpu/drm/qxl/qxl_object.h | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/qxl/qxl_cmd.c +1 -1
index 798f9dd7ad75..54e3c3a97440 100644
@@ -588,7 +588,7 @@ static int qxl_reap_surf(struct qxl_device *qdev, struct qxl_bo *surf, bool stal
 {
 	int ret;
 
-	ret = qxl_bo_reserve(surf, false);
+	ret = qxl_bo_reserve(surf);
 	if (ret)
 		return ret;
 
drivers/gpu/drm/qxl/qxl_ioctl.c +1 -1
index 8f605d5cc149..5cea6eea72ab 100644
@@ -322,7 +322,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data,
 
 	qobj = gem_to_qxl_bo(gobj);
 
-	ret = qxl_bo_reserve(qobj, false);
+	ret = qxl_bo_reserve(qobj);
 	if (ret)
 		goto out;
 
drivers/gpu/drm/qxl/qxl_object.c +2 -2
index 80e7a17aaddd..f838b6d689aa 100644
@@ -284,7 +284,7 @@ int qxl_bo_pin(struct qxl_bo *bo)
 {
 	int r;
 
-	r = qxl_bo_reserve(bo, false);
+	r = qxl_bo_reserve(bo);
 	if (r)
 		return r;
 
@@ -302,7 +302,7 @@ int qxl_bo_unpin(struct qxl_bo *bo)
 {
 	int r;
 
-	r = qxl_bo_reserve(bo, false);
+	r = qxl_bo_reserve(bo);
 	if (r)
 		return r;
 
drivers/gpu/drm/qxl/qxl_object.h +2 -2
index 21fa81048f4f..6b434e5ef795 100644
@@ -27,11 +27,11 @@
 
 #include "qxl_drv.h"
 
-static inline int qxl_bo_reserve(struct qxl_bo *bo, bool no_wait)
+static inline int qxl_bo_reserve(struct qxl_bo *bo)
 {
 	int r;
 
-	r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL);
+	r = ttm_bo_reserve(&bo->tbo, true, false, NULL);
 	if (unlikely(r != 0)) {
 		if (r != -ERESTARTSYS) {
 			struct drm_device *ddev = bo->tbo.base.dev;
Signature · 6 lines
2.26.2

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

PATCH 5/59 drm/ttm/amdgpu: consolidate ttm reserve paths

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Drop the WARN_ON and consolidate the two paths into one.

Use the consolidate slowpath in the execbuf utils code.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +-
 drivers/gpu/drm/ttm/ttm_execbuf_util.c     | 12 +--
 include/drm/ttm/ttm_bo_driver.h            | 91 ++++------------------
 3 files changed, 20 insertions(+), 85 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index afa5189dba7d..e01e8903741e 100644
@@ -160,7 +160,7 @@ static inline int amdgpu_bo_reserve(struct amdgpu_bo *bo, bool no_intr)
 	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 	int r;
 
-	r = __ttm_bo_reserve(&bo->tbo, !no_intr, false, NULL);
+	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, NULL);
 	if (unlikely(r != 0)) {
 		if (r != -ERESTARTSYS)
 			dev_err(adev->dev, "%p reserve failed\n", bo);
drivers/gpu/drm/ttm/ttm_execbuf_util.c +2 -10
index 1797f04c0534..8a8f1a6a83a6 100644
@@ -93,7 +93,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
 	list_for_each_entry(entry, list, head) {
 		struct ttm_buffer_object *bo = entry->bo;
 
-		ret = __ttm_bo_reserve(bo, intr, (ticket == NULL), ticket);
+		ret = ttm_bo_reserve(bo, intr, (ticket == NULL), ticket);
 		if (ret == -EALREADY && dups) {
 			struct ttm_validate_buffer *safe = entry;
 			entry = list_prev_entry(entry, head);
@@ -119,13 +119,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
 		ttm_eu_backoff_reservation_reverse(list, entry);
 
 		if (ret == -EDEADLK) {
-			if (intr) {
-				ret = dma_resv_lock_slow_interruptible(bo->base.resv,
-										 ticket);
-			} else {
-				dma_resv_lock_slow(bo->base.resv, ticket);
-				ret = 0;
-			}
+			ret = ttm_bo_reserve_slowpath(bo, intr, ticket);
 		}
 
 		if (!ret && entry->num_shared)
@@ -133,8 +127,6 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
 								entry->num_shared);
 
 		if (unlikely(ret != 0)) {
-			if (ret == -EINTR)
-				ret = -ERESTARTSYS;
 			if (ticket) {
 				ww_acquire_done(ticket);
 				ww_acquire_fini(ticket);
include/drm/ttm/ttm_bo_driver.h +17 -74

125 lines not on this page · raw message

Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 5/59
#10 lore raw

Re: [PATCH 05/59] drm/ttm/amdgpu: consolidate ttm reserve paths

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 7 lines

From: Dave Airlie <[email protected]>

Drop the WARN_ON and consolidate the two paths into one.

Use the consolidate slowpath in the execbuf utils code.

Quoted 178 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +-
  drivers/gpu/drm/ttm/ttm_execbuf_util.c     | 12 +--
  include/drm/ttm/ttm_bo_driver.h            | 91 ++++------------------
  3 files changed, 20 insertions(+), 85 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index afa5189dba7d..e01e8903741e 100644
@@ -160,7 +160,7 @@ static inline int amdgpu_bo_reserve(struct amdgpu_bo *bo, bool no_intr)
  	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
  	int r;
 
-	r = __ttm_bo_reserve(&bo->tbo, !no_intr, false, NULL);
+	r = ttm_bo_reserve(&bo->tbo, !no_intr, false, NULL);
  	if (unlikely(r != 0)) {
  		if (r != -ERESTARTSYS)
  			dev_err(adev->dev, "%p reserve failed\n", bo);
drivers/gpu/drm/ttm/ttm_execbuf_util.c +2 -10
index 1797f04c0534..8a8f1a6a83a6 100644
@@ -93,7 +93,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
  	list_for_each_entry(entry, list, head) {
  		struct ttm_buffer_object *bo = entry->bo;
 
-		ret = __ttm_bo_reserve(bo, intr, (ticket == NULL), ticket);
+		ret = ttm_bo_reserve(bo, intr, (ticket == NULL), ticket);
  		if (ret == -EALREADY && dups) {
  			struct ttm_validate_buffer *safe = entry;
  			entry = list_prev_entry(entry, head);
@@ -119,13 +119,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
  		ttm_eu_backoff_reservation_reverse(list, entry);
 
  		if (ret == -EDEADLK) {
-			if (intr) {
-				ret = dma_resv_lock_slow_interruptible(bo->base.resv,
-										 ticket);
-			} else {
-				dma_resv_lock_slow(bo->base.resv, ticket);
-				ret = 0;
-			}
+			ret = ttm_bo_reserve_slowpath(bo, intr, ticket);
  		}
 
  		if (!ret && entry->num_shared)
@@ -133,8 +127,6 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
  								entry->num_shared);
 
  		if (unlikely(ret != 0)) {
-			if (ret == -EINTR)
-				ret = -ERESTARTSYS;
  			if (ticket) {
  				ww_acquire_done(ticket);
  				ww_acquire_fini(ticket);
include/drm/ttm/ttm_bo_driver.h +10 -74
index 09211ecbf84f..c20fef4da1d3 100644
@@ -588,29 +588,30 @@ int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible);
  void ttm_mem_io_unlock(struct ttm_mem_type_manager *man);
 
  /**
- * __ttm_bo_reserve:
+ * ttm_bo_reserve:
   *
   * @bo: A pointer to a struct ttm_buffer_object.
   * @interruptible: Sleep interruptible if waiting.
   * @no_wait: Don't sleep while trying to reserve, rather return -EBUSY.
   * @ticket: ticket used to acquire the ww_mutex.
   *
- * Will not remove reserved buffers from the lru lists.
- * Otherwise identical to ttm_bo_reserve.
+ * Locks a buffer object for validation. (Or prevents other processes from
+ * locking it for validation), while taking a number of measures to prevent
+ * deadlocks.
   *
   * Returns:
   * -EDEADLK: The reservation may cause a deadlock.
   * Release all buffer reservations, wait for @bo to become unreserved and
- * try again. (only if use_sequence == 1).
+ * try again.
   * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by
   * a signal. Release all buffer reservations and return to user-space.
   * -EBUSY: The function needed to sleep, but @no_wait was true
   * -EALREADY: Bo already reserved using @ticket. This error code will only
   * be returned if @use_ticket is set to true.
   */
-static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo,
-				   bool interruptible, bool no_wait,
-				   struct ww_acquire_ctx *ticket)
+static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,
+				 bool interruptible, bool no_wait,
+				 struct ww_acquire_ctx *ticket)
  {
  	int ret = 0;
 
@@ -632,59 +633,6 @@ static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo,
  	return ret;
  }
 
-/**
- * ttm_bo_reserve:
- *
- * @bo: A pointer to a struct ttm_buffer_object.
- * @interruptible: Sleep interruptible if waiting.
- * @no_wait: Don't sleep while trying to reserve, rather return -EBUSY.
- * @ticket: ticket used to acquire the ww_mutex.
- *
- * Locks a buffer object for validation. (Or prevents other processes from
- * locking it for validation) and removes it from lru lists, while taking
- * a number of measures to prevent deadlocks.
- *
- * Deadlocks may occur when two processes try to reserve multiple buffers in
- * different order, either by will or as a result of a buffer being evicted
- * to make room for a buffer already reserved. (Buffers are reserved before
- * they are evicted). The following algorithm prevents such deadlocks from
- * occurring:
- * Processes attempting to reserve multiple buffers other than for eviction,
- * (typically execbuf), should first obtain a unique 32-bit
- * validation sequence number,
- * and call this function with @use_ticket == 1 and @ticket->stamp == the unique
- * sequence number. If upon call of this function, the buffer object is already
- * reserved, the validation sequence is checked against the validation
- * sequence of the process currently reserving the buffer,
- * and if the current validation sequence is greater than that of the process
- * holding the reservation, the function returns -EDEADLK. Otherwise it sleeps
- * waiting for the buffer to become unreserved, after which it retries
- * reserving.
- * The caller should, when receiving an -EDEADLK error
- * release all its buffer reservations, wait for @bo to become unreserved, and
- * then rerun the validation with the same validation sequence. This procedure
- * will always guarantee that the process with the lowest validation sequence
- * will eventually succeed, preventing both deadlocks and starvation.
- *
- * Returns:
- * -EDEADLK: The reservation may cause a deadlock.
- * Release all buffer reservations, wait for @bo to become unreserved and
- * try again. (only if use_sequence == 1).
- * -ERESTARTSYS: A wait for the buffer to become unreserved was interrupted by
- * a signal. Release all buffer reservations and return to user-space.
- * -EBUSY: The function needed to sleep, but @no_wait was true
- * -EALREADY: Bo already reserved using @ticket. This error code will only
- * be returned if @use_ticket is set to true.
- */
-static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,
-				 bool interruptible, bool no_wait,
-				 struct ww_acquire_ctx *ticket)
-{
-	WARN_ON(!kref_read(&bo->kref));
-
-	return __ttm_bo_reserve(bo, interruptible, no_wait, ticket);
-}
-
  /**
   * ttm_bo_reserve_slowpath:
   * @bo: A pointer to a struct ttm_buffer_object.
@@ -699,20 +647,15 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
  					  bool interruptible,
  					  struct ww_acquire_ctx *ticket)
  {
-	int ret = 0;
-
-	WARN_ON(!kref_read(&bo->kref));
-
-	if (interruptible)
-		ret = dma_resv_lock_slow_interruptible(bo->base.resv,
-								 ticket);
-	else
-		dma_resv_lock_slow(bo->base.resv, ticket);
-
-	if (ret == -EINTR)
-		ret = -ERESTARTSYS;
-
-	return ret;
+	if (interruptible) {
+		int ret = dma_resv_lock_slow_interruptible(bo->base.resv,

include/drm/ttm/ttm_bo_driver.h static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo, · line 661

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7 -0
+							   ticket);
+		if (ret == -EINTR)
+			ret = -ERESTARTSYS;
+		return ret;
+	}
+	dma_resv_lock_slow(bo->base.resv, ticket);
+	return 0;
  }
 
  /**

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

author maintainer
#11 lore raw

PATCH 6/59 drm/ttm: use a helper for unlocked moves to the lru tail

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

The pattern was repeated a few times, just make an inline for it.

---
 drivers/gpu/drm/ttm/ttm_bo.c    |  8 ++------
 drivers/gpu/drm/ttm/ttm_bo_vm.c |  4 +---
 include/drm/ttm/ttm_bo_driver.h | 11 ++++++++---
 3 files changed, 11 insertions(+), 12 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -6
index 721ff546bf47..2b49037231eb 100644
@@ -1103,9 +1103,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
 
 error:
 	if (bo->mem.mem_type == TTM_PL_SYSTEM && !list_empty(&bo->lru)) {
-		spin_lock(&ttm_bo_glob.lru_lock);
-		ttm_bo_move_to_lru_tail(bo, NULL);
-		spin_unlock(&ttm_bo_glob.lru_lock);
+		ttm_bo_move_to_lru_tail_unlocked(bo);
 	}
 
 	return ret;
@@ -1320,9 +1318,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
 		return ret;
 	}
 
-	spin_lock(&ttm_bo_glob.lru_lock);
-	ttm_bo_move_to_lru_tail(bo, NULL);
-	spin_unlock(&ttm_bo_glob.lru_lock);
+	ttm_bo_move_to_lru_tail_unlocked(bo);
 
 	return ret;
 }
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -3
index d7a6537dd6ee..468a0eb9e632 100644
@@ -308,9 +308,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
 		}
 
 		if (bo->moving != moving) {
-			spin_lock(&ttm_bo_glob.lru_lock);
-			ttm_bo_move_to_lru_tail(bo, NULL);
-			spin_unlock(&ttm_bo_glob.lru_lock);
+			ttm_bo_move_to_lru_tail_unlocked(bo);
 		}
 		dma_fence_put(moving);
 	}
include/drm/ttm/ttm_bo_driver.h +8 -3
index c20fef4da1d3..7958e411269a 100644
@@ -658,6 +658,13 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
 	return 0;
 }
 
+static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo)
+{
+	spin_lock(&ttm_bo_glob.lru_lock);
+	ttm_bo_move_to_lru_tail(bo, NULL);
+	spin_unlock(&ttm_bo_glob.lru_lock);
+}
+
 /**
  * ttm_bo_unreserve
  *
@@ -667,9 +674,7 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
  */
 static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
 {
-	spin_lock(&ttm_bo_glob.lru_lock);
-	ttm_bo_move_to_lru_tail(bo, NULL);
-	spin_unlock(&ttm_bo_glob.lru_lock);
+	ttm_bo_move_to_lru_tail_unlocked(bo);
 	dma_resv_unlock(bo->base.resv);
 }
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 6/59
#12 lore raw

Re: [PATCH 06/59] drm/ttm: use a helper for unlocked moves to the lru tail

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

The pattern was repeated a few times, just make an inline for it.

Quoted 66 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    |  8 ++------
  drivers/gpu/drm/ttm/ttm_bo_vm.c |  4 +---
  include/drm/ttm/ttm_bo_driver.h | 11 ++++++++---
  3 files changed, 11 insertions(+), 12 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -6
index 721ff546bf47..2b49037231eb 100644
@@ -1103,9 +1103,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
 
  error:
  	if (bo->mem.mem_type == TTM_PL_SYSTEM && !list_empty(&bo->lru)) {
-		spin_lock(&ttm_bo_glob.lru_lock);
-		ttm_bo_move_to_lru_tail(bo, NULL);
-		spin_unlock(&ttm_bo_glob.lru_lock);
+		ttm_bo_move_to_lru_tail_unlocked(bo);
  	}
 
  	return ret;
@@ -1320,9 +1318,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
  		return ret;
  	}
 
-	spin_lock(&ttm_bo_glob.lru_lock);
-	ttm_bo_move_to_lru_tail(bo, NULL);
-	spin_unlock(&ttm_bo_glob.lru_lock);
+	ttm_bo_move_to_lru_tail_unlocked(bo);
 
  	return ret;
  }
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -3
index d7a6537dd6ee..468a0eb9e632 100644
@@ -308,9 +308,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
  		}
 
  		if (bo->moving != moving) {
-			spin_lock(&ttm_bo_glob.lru_lock);
-			ttm_bo_move_to_lru_tail(bo, NULL);
-			spin_unlock(&ttm_bo_glob.lru_lock);
+			ttm_bo_move_to_lru_tail_unlocked(bo);
  		}
  		dma_fence_put(moving);
  	}
include/drm/ttm/ttm_bo_driver.h +7 -0
index c20fef4da1d3..7958e411269a 100644
@@ -658,6 +658,13 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
  	return 0;
  }
 
+static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo)
+{
+	spin_lock(&ttm_bo_glob.lru_lock);
+	ttm_bo_move_to_lru_tail(bo, NULL);
+	spin_unlock(&ttm_bo_glob.lru_lock);
+}
+
  /**
   * ttm_bo_unreserve
   *

include/drm/ttm/ttm_bo_driver.h static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo, · line 680

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +1 -3
@@ -667,9 +674,7 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
   */
  static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
  {
-	spin_lock(&ttm_bo_glob.lru_lock);
-	ttm_bo_move_to_lru_tail(bo, NULL);
-	spin_unlock(&ttm_bo_glob.lru_lock);
+	ttm_bo_move_to_lru_tail_unlocked(bo);
  	dma_resv_unlock(bo->base.resv);
  }
 

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

Reviewed-by
#13 lore raw

Re: [PATCH 06/59] drm/ttm: use a helper for unlocked moves to the lru tail

Quoted 9 lines · Christian König

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

The pattern was repeated a few times, just make an inline for it.

Quoted 74 lines
Quoted 74 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    |  8 ++------
  drivers/gpu/drm/ttm/ttm_bo_vm.c |  4 +---
  include/drm/ttm/ttm_bo_driver.h | 11 ++++++++---
  3 files changed, 11 insertions(+), 12 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -6
index 721ff546bf47..2b49037231eb 100644
@@ -1103,9 +1103,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
 
  error:
      if (bo->mem.mem_type == TTM_PL_SYSTEM && !list_empty(&bo->lru)) {
-             spin_lock(&ttm_bo_glob.lru_lock);
-             ttm_bo_move_to_lru_tail(bo, NULL);
-             spin_unlock(&ttm_bo_glob.lru_lock);
+             ttm_bo_move_to_lru_tail_unlocked(bo);
      }
 
      return ret;
@@ -1320,9 +1318,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev,
              return ret;
      }
 
-     spin_lock(&ttm_bo_glob.lru_lock);
-     ttm_bo_move_to_lru_tail(bo, NULL);
-     spin_unlock(&ttm_bo_glob.lru_lock);
+     ttm_bo_move_to_lru_tail_unlocked(bo);
 
      return ret;
  }
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -3
index d7a6537dd6ee..468a0eb9e632 100644
@@ -308,9 +308,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
              }
 
              if (bo->moving != moving) {
-                     spin_lock(&ttm_bo_glob.lru_lock);
-                     ttm_bo_move_to_lru_tail(bo, NULL);
-                     spin_unlock(&ttm_bo_glob.lru_lock);
+                     ttm_bo_move_to_lru_tail_unlocked(bo);
              }
              dma_fence_put(moving);
      }
include/drm/ttm/ttm_bo_driver.h +8 -3
index c20fef4da1d3..7958e411269a 100644
@@ -658,6 +658,13 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
      return 0;
  }
 
+static inline void ttm_bo_move_to_lru_tail_unlocked(struct ttm_buffer_object *bo)
+{
+     spin_lock(&ttm_bo_glob.lru_lock);
+     ttm_bo_move_to_lru_tail(bo, NULL);
+     spin_unlock(&ttm_bo_glob.lru_lock);
+}
+
  /**
   * ttm_bo_unreserve
   *
@@ -667,9 +674,7 @@ static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
   */
  static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
  {
-     spin_lock(&ttm_bo_glob.lru_lock);
-     ttm_bo_move_to_lru_tail(bo, NULL);
-     spin_unlock(&ttm_bo_glob.lru_lock);
+     ttm_bo_move_to_lru_tail_unlocked(bo);
Quoted 8 lines

include/drm/ttm/ttm_bo_driver.h static inline int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo, · line 680

Quoted 3 lines
include/drm/ttm/ttm_bo_driver.h +0 -0
      dma_resv_unlock(bo->base.resv);
  }
 

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

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

author maintainer
#14 lore raw

PATCH 7/59 drm/vram-helper: remove populate/unpopulate

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

The default path for populate/unpopulate is already this.

---
 drivers/gpu/drm/drm_gem_vram_helper.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +0 -2
index 5f03c6137ef9..a93a00966f3a 100644
@@ -1061,8 +1061,6 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev,
 
 static struct ttm_bo_driver bo_driver = {
 	.ttm_tt_create = bo_driver_ttm_tt_create,
-	.ttm_tt_populate = ttm_pool_populate,
-	.ttm_tt_unpopulate = ttm_pool_unpopulate,
 	.eviction_valuable = ttm_bo_eviction_valuable,
 	.evict_flags = bo_driver_evict_flags,
 	.move_notify = bo_driver_move_notify,
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 7/59
#15 lore raw

Re: [PATCH 07/59] drm/vram-helper: remove populate/unpopulate

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

The default path for populate/unpopulate is already this.

Quoted 18 lines
---
 drivers/gpu/drm/drm_gem_vram_helper.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +0 -2
index 5f03c6137ef9..a93a00966f3a 100644
@@ -1061,8 +1061,6 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev,
 
 static struct ttm_bo_driver bo_driver = {
 	.ttm_tt_create = bo_driver_ttm_tt_create,
-	.ttm_tt_populate = ttm_pool_populate,
-	.ttm_tt_unpopulate = ttm_pool_unpopulate,
 	.eviction_valuable = ttm_bo_eviction_valuable,
 	.evict_flags = bo_driver_evict_flags,
 	.move_notify = bo_driver_move_notify,
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

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

author maintainer
#16 lore raw

PATCH 8/59 drm/ttm: export memory type debug entrypoint.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

As suggested on review, just export the memory type debug for drivers to use, while also making the debug callback optional (don't need to test for system as it won't init it).

rename it to be more consistent with object name for now. (we may rename all the objects later.)

---
 drivers/gpu/drm/ttm/ttm_bo.c    | 13 +++++++------
 include/drm/ttm/ttm_bo_driver.h |  8 ++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +7 -6
index 2b49037231eb..2ac70ec1f37d 100644
@@ -77,26 +77,26 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place,
 	return 0;
 }
 
-static void ttm_mem_type_debug(struct ttm_bo_device *bdev, struct drm_printer *p,
-			       int mem_type)
+void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
+				struct drm_printer *p)
 {
-	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
-
 	drm_printf(p, "    has_type: %d\n", man->has_type);
 	drm_printf(p, "    use_type: %d\n", man->use_type);
 	drm_printf(p, "    use_tt: %d\n", man->use_tt);
 	drm_printf(p, "    size: %llu\n", man->size);
 	drm_printf(p, "    available_caching: 0x%08X\n", man->available_caching);
 	drm_printf(p, "    default_caching: 0x%08X\n", man->default_caching);
-	if (mem_type != TTM_PL_SYSTEM)
+	if (man->func && man->func->debug)
 		(*man->func->debug)(man, p);
 }
+EXPORT_SYMBOL(ttm_mem_type_manager_debug);
 
 static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
 					struct ttm_placement *placement)
 {
 	struct drm_printer p = drm_debug_printer(TTM_PFX);
 	int i, ret, mem_type;
+	struct ttm_mem_type_manager *man;
 
 	drm_printf(&p, "No space for %p (%lu pages, %luK, %luM)\n",
 		   bo, bo->mem.num_pages, bo->mem.size >> 10,
@@ -108,7 +108,8 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
 			return;
 		drm_printf(&p, "  placement[%d]=0x%08X (%d)\n",
 			   i, placement->placement[i].flags, mem_type);
-		ttm_mem_type_debug(bo->bdev, &p, mem_type);
+		man = &bo->bdev->man[mem_type];
+		ttm_mem_type_manager_debug(man, &p);
 	}
 }
 
include/drm/ttm/ttm_bo_driver.h +8 -0
index 7958e411269a..73f5d9c766cc 100644
@@ -795,4 +795,12 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
 
 extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 
+/**
+ * ttm_mem_type_manager_debug
+ *
+ * @man: manager type to dump.
+ * @p: printer to use for debug.
+ */
+void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
+				struct drm_printer *p);
 #endif
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 8/59
#17 lore raw

Re: [PATCH 08/59] drm/ttm: export memory type debug entrypoint.

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 10 lines

From: Dave Airlie <[email protected]>

As suggested on review, just export the memory type debug for drivers to use, while also making the debug callback optional (don't need to test for system as it won't init it).

rename it to be more consistent with object name for now. (we may rename all the objects later.)

Quoted 58 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    | 13 +++++++------
  include/drm/ttm/ttm_bo_driver.h |  8 ++++++++
  2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +7 -6
index 2b49037231eb..2ac70ec1f37d 100644
@@ -77,26 +77,26 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place,
  	return 0;
  }
 
-static void ttm_mem_type_debug(struct ttm_bo_device *bdev, struct drm_printer *p,
-			       int mem_type)
+void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
+				struct drm_printer *p)
  {
-	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
-
  	drm_printf(p, "    has_type: %d\n", man->has_type);
  	drm_printf(p, "    use_type: %d\n", man->use_type);
  	drm_printf(p, "    use_tt: %d\n", man->use_tt);
  	drm_printf(p, "    size: %llu\n", man->size);
  	drm_printf(p, "    available_caching: 0x%08X\n", man->available_caching);
  	drm_printf(p, "    default_caching: 0x%08X\n", man->default_caching);
-	if (mem_type != TTM_PL_SYSTEM)
+	if (man->func && man->func->debug)
  		(*man->func->debug)(man, p);
  }
+EXPORT_SYMBOL(ttm_mem_type_manager_debug);
 
  static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
  					struct ttm_placement *placement)
  {
  	struct drm_printer p = drm_debug_printer(TTM_PFX);
  	int i, ret, mem_type;
+	struct ttm_mem_type_manager *man;
 
  	drm_printf(&p, "No space for %p (%lu pages, %luK, %luM)\n",
  		   bo, bo->mem.num_pages, bo->mem.size >> 10,
@@ -108,7 +108,8 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
  			return;
  		drm_printf(&p, "  placement[%d]=0x%08X (%d)\n",
  			   i, placement->placement[i].flags, mem_type);
-		ttm_mem_type_debug(bo->bdev, &p, mem_type);
+		man = &bo->bdev->man[mem_type];
+		ttm_mem_type_manager_debug(man, &p);
  	}
  }
 
include/drm/ttm/ttm_bo_driver.h +0 -0
index 7958e411269a..73f5d9c766cc 100644
@@ -795,4 +795,12 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
 
  extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;

include/drm/ttm/ttm_bo_driver.h pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp); · line 806

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +8 -0
 
+/**
+ * ttm_mem_type_manager_debug
+ *
+ * @man: manager type to dump.
+ * @p: printer to use for debug.
+ */
+void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
+				struct drm_printer *p);
  #endif

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

Reviewed-by
#18 lore raw

Re: [PATCH 08/59] drm/ttm: export memory type debug entrypoint.

Quoted 8 lines · Christian König

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 6 lines

From: Dave Airlie <[email protected]>

As suggested on review, just export the memory type debug for drivers to use, while also making the debug callback optional (don't need to test for system as it won't init it).

Quoted 6 lines
Quoted 4 lines

rename it to be more consistent with object name for now. (we may rename all the objects later.)

Quoted 60 lines
Quoted 60 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    | 13 +++++++------
  include/drm/ttm/ttm_bo_driver.h |  8 ++++++++
  2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +7 -6
index 2b49037231eb..2ac70ec1f37d 100644
@@ -77,26 +77,26 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place,
      return 0;
  }
 
-static void ttm_mem_type_debug(struct ttm_bo_device *bdev, struct drm_printer *p,
-                            int mem_type)
+void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
+                             struct drm_printer *p)
  {
-     struct ttm_mem_type_manager *man = &bdev->man[mem_type];
-
      drm_printf(p, "    has_type: %d\n", man->has_type);
      drm_printf(p, "    use_type: %d\n", man->use_type);
      drm_printf(p, "    use_tt: %d\n", man->use_tt);
      drm_printf(p, "    size: %llu\n", man->size);
      drm_printf(p, "    available_caching: 0x%08X\n", man->available_caching);
      drm_printf(p, "    default_caching: 0x%08X\n", man->default_caching);
-     if (mem_type != TTM_PL_SYSTEM)
+     if (man->func && man->func->debug)
              (*man->func->debug)(man, p);
  }
+EXPORT_SYMBOL(ttm_mem_type_manager_debug);
 
  static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
                                      struct ttm_placement *placement)
  {
      struct drm_printer p = drm_debug_printer(TTM_PFX);
      int i, ret, mem_type;
+     struct ttm_mem_type_manager *man;
 
      drm_printf(&p, "No space for %p (%lu pages, %luK, %luM)\n",
                 bo, bo->mem.num_pages, bo->mem.size >> 10,
@@ -108,7 +108,8 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
                      return;
              drm_printf(&p, "  placement[%d]=0x%08X (%d)\n",
                         i, placement->placement[i].flags, mem_type);
-             ttm_mem_type_debug(bo->bdev, &p, mem_type);
+             man = &bo->bdev->man[mem_type];
+             ttm_mem_type_manager_debug(man, &p);
      }
  }
 
include/drm/ttm/ttm_bo_driver.h +0 -0
index 7958e411269a..73f5d9c766cc 100644
@@ -795,4 +795,12 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
 
  extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 
Quoted 14 lines

include/drm/ttm/ttm_bo_driver.h pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp); · line 806

Quoted 9 lines
include/drm/ttm/ttm_bo_driver.h +8 -0
+/**
+ * ttm_mem_type_manager_debug
+ *
+ * @man: manager type to dump.
+ * @p: printer to use for debug.
+ */
+void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
+                             struct drm_printer *p);
  #endif

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

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

author maintainer
#19 lore raw

PATCH 9/59 drm/nouveau/ttm: don't fill in blank ttm debug callback

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +0 -9
index b0012021ae12..6de762a0c229 100644
@@ -49,12 +49,6 @@ nouveau_manager_del(struct ttm_mem_type_manager *man, struct ttm_mem_reg *reg)
 	nouveau_mem_del(reg);
 }
 
-static void
-nouveau_manager_debug(struct ttm_mem_type_manager *man,
-		      struct drm_printer *printer)
-{
-}
-
 static int
 nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
 			 struct ttm_buffer_object *bo,
@@ -86,7 +80,6 @@ const struct ttm_mem_type_manager_func nouveau_vram_manager = {
 	.takedown = nouveau_manager_fini,
 	.get_node = nouveau_vram_manager_new,
 	.put_node = nouveau_manager_del,
-	.debug = nouveau_manager_debug,
 };
 
 static int
@@ -112,7 +105,6 @@ const struct ttm_mem_type_manager_func nouveau_gart_manager = {
 	.takedown = nouveau_manager_fini,
 	.get_node = nouveau_gart_manager_new,
 	.put_node = nouveau_manager_del,
-	.debug = nouveau_manager_debug
 };
 
 static int
@@ -147,7 +139,6 @@ const struct ttm_mem_type_manager_func nv04_gart_manager = {
 	.takedown = nouveau_manager_fini,
 	.get_node = nv04_gart_manager_new,
 	.put_node = nouveau_manager_del,
-	.debug = nouveau_manager_debug
 };
 
 int
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 9/59
#20 lore raw

Re: [PATCH 09/59] drm/nouveau/ttm: don't fill in blank ttm debug callback

Quoted 5 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 48 lines
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +0 -10
index b0012021ae12..6de762a0c229 100644
@@ -49,12 +49,6 @@ nouveau_manager_del(struct ttm_mem_type_manager *man, struct ttm_mem_reg *reg)
        nouveau_mem_del(reg);
 }
 
-static void
-nouveau_manager_debug(struct ttm_mem_type_manager *man,
-                     struct drm_printer *printer)
-{
-}
-
 static int
 nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
                         struct ttm_buffer_object *bo,
@@ -86,7 +80,6 @@ const struct ttm_mem_type_manager_func nouveau_vram_manager = {
        .takedown = nouveau_manager_fini,
        .get_node = nouveau_vram_manager_new,
        .put_node = nouveau_manager_del,
-       .debug = nouveau_manager_debug,
 };
 
 static int
@@ -112,7 +105,6 @@ const struct ttm_mem_type_manager_func nouveau_gart_manager = {
        .takedown = nouveau_manager_fini,
        .get_node = nouveau_gart_manager_new,
        .put_node = nouveau_manager_del,
-       .debug = nouveau_manager_debug
 };
 
 static int
@@ -147,7 +139,6 @@ const struct ttm_mem_type_manager_func nv04_gart_manager = {
        .takedown = nouveau_manager_fini,
        .get_node = nv04_gart_manager_new,
        .put_node = nouveau_manager_del,
-       .debug = nouveau_manager_debug
 };
 
 int
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#21 lore raw

PATCH 10/59 drm/vmwgfx/gmrid: don't provide pointless ttm debug callback

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +0 -7
index 4a76fc7114ad..fb1bf4dd91d1 100644
@@ -137,16 +137,9 @@ static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man)
 	return 0;
 }
 
-static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
-				struct drm_printer *printer)
-{
-	drm_printf(printer, "No debug info available for the GMR id manager\n");
-}
-
 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
 	.init = vmw_gmrid_man_init,
 	.takedown = vmw_gmrid_man_takedown,
 	.get_node = vmw_gmrid_man_get_node,
 	.put_node = vmw_gmrid_man_put_node,
-	.debug = vmw_gmrid_man_debug
 };
Signature · 6 lines
2.26.2

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

PATCH 11/59 drm/qxl/ttm: call ttm manager debug (v2)

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

v2: use the new exported interface.
This code was poking inside a struct and assuming it was a drm_mm at the start. Call the proper API.

---
 drivers/gpu/drm/qxl/qxl_ttm.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +4 -6
index 759c9d601072..3e664bb58764 100644
@@ -279,12 +279,10 @@ void qxl_ttm_fini(struct qxl_device *qdev)
 static int qxl_mm_dump_table(struct seq_file *m, void *data)
 {
 	struct drm_info_node *node = (struct drm_info_node *)m->private;
-	struct drm_mm *mm = (struct drm_mm *)node->info_ent->data;
+	struct ttm_mem_type_manager *man = (struct ttm_mem_type_manager *)node->info_ent->data;
 	struct drm_printer p = drm_seq_file_printer(m);
 
-	spin_lock(&ttm_bo_glob.lru_lock);
-	drm_mm_print(mm, &p);
-	spin_unlock(&ttm_bo_glob.lru_lock);
+	ttm_mem_type_manager_debug(man, &p);
 	return 0;
 }
 #endif
@@ -305,9 +303,9 @@ void qxl_ttm_debugfs_init(struct qxl_device *qdev)
 		qxl_mem_types_list[i].show = &qxl_mm_dump_table;
 		qxl_mem_types_list[i].driver_features = 0;
 		if (i == 0)
-			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
+			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_VRAM];
 		else
-			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV].priv;
+			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_PRIV];
 
 	}
 	qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 11/59
#23 lore raw

Re: [PATCH 11/59] drm/qxl/ttm: call ttm manager debug (v2)

Quoted 5 lines · Dave Airlie

From: Dave Airlie <[email protected]>

v2: use the new exported interface.
This code was poking inside a struct and assuming it was a drm_mm at the start. Call the proper API.

[ also adds some debug info about the ttm manager to the file ]

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

author maintainer
#24 lore raw

PATCH 12/59 drm/vram-helper: call the ttm manager debug function

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This code was assuming there was a drm_mm here, don't do that call the correct API.

v2: use the new exported interface.

---
 drivers/gpu/drm/drm_gem_vram_helper.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +2 -4
index a93a00966f3a..c20aee2fddf3 100644
@@ -1075,12 +1075,10 @@ static int drm_vram_mm_debugfs(struct seq_file *m, void *data)
 {
 	struct drm_info_node *node = (struct drm_info_node *) m->private;
 	struct drm_vram_mm *vmm = node->minor->dev->vram_mm;
-	struct drm_mm *mm = vmm->bdev.man[TTM_PL_VRAM].priv;
+	struct ttm_mem_type_manager *man = &vmm->bdev.man[TTM_PL_VRAM];
 	struct drm_printer p = drm_seq_file_printer(m);
 
-	spin_lock(&ttm_bo_glob.lru_lock);
-	drm_mm_print(mm, &p);
-	spin_unlock(&ttm_bo_glob.lru_lock);
+	ttm_mem_type_manager_debug(man, &p);
 	return 0;
 }
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 12/59
#25 lore raw

Re: [PATCH 12/59] drm/vram-helper: call the ttm manager debug function

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 8 lines

From: Dave Airlie <[email protected]>

This code was assuming there was a drm_mm here, don't do that call the correct API.

v2: use the new exported interface.

Quoted 24 lines
---
 drivers/gpu/drm/drm_gem_vram_helper.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +2 -4
index a93a00966f3a..c20aee2fddf3 100644
@@ -1075,12 +1075,10 @@ static int drm_vram_mm_debugfs(struct seq_file *m, void *data)
 {
 	struct drm_info_node *node = (struct drm_info_node *) m->private;
 	struct drm_vram_mm *vmm = node->minor->dev->vram_mm;
-	struct drm_mm *mm = vmm->bdev.man[TTM_PL_VRAM].priv;
+	struct ttm_mem_type_manager *man = &vmm->bdev.man[TTM_PL_VRAM];
 	struct drm_printer p = drm_seq_file_printer(m);
 
-	spin_lock(&ttm_bo_glob.lru_lock);
-	drm_mm_print(mm, &p);
-	spin_unlock(&ttm_bo_glob.lru_lock);
+	ttm_mem_type_manager_debug(man, &p);
 	return 0;
 }
 
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

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

maintainer Reviewed-by on v1 12/59
#26 lore raw

Re: [PATCH 12/59] drm/vram-helper: call the ttm manager debug function

In reply to Dave Airlie
Quoted 6 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This code was assuming there was a drm_mm here, don't do that call the correct API.

v2: use the new exported interface.

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

author maintainer
#27 lore raw

PATCH 13/59 drm/ttm: split the mm manager init code (v2)

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This will allow the driver to control the ordering here better.

Eventually the old path will be removed.

v2: add docs for new APIs.
rename new path to ttm_mem_type_manager_init/set_used(for now)

---
 drivers/gpu/drm/ttm/ttm_bo.c    | 34 +++++++++++++++++++--------------
 include/drm/ttm/ttm_bo_api.h    | 15 +++++++++++++++
 include/drm/ttm/ttm_bo_driver.h | 15 +++++++++++++++
 3 files changed, 50 insertions(+), 14 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +20 -14
index 2ac70ec1f37d..300bcc10696a 100644
@@ -1509,35 +1509,41 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);
 
-int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-			unsigned long p_size)
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+			       struct ttm_mem_type_manager *man,
+			       unsigned long p_size)
 {
-	int ret;
-	struct ttm_mem_type_manager *man;
 	unsigned i;
 
-	BUG_ON(type >= TTM_NUM_MEM_TYPES);
-	man = &bdev->man[type];
 	BUG_ON(man->has_type);
 	man->use_io_reserve_lru = false;
 	mutex_init(&man->io_reserve_mutex);
 	spin_lock_init(&man->move_lock);
 	INIT_LIST_HEAD(&man->io_reserve_lru);
 	man->bdev = bdev;
-
-	if (type != TTM_PL_SYSTEM) {
-		ret = (*man->func->init)(man, p_size);
-		if (ret)
-			return ret;
-	}
-	man->has_type = true;
-	man->use_type = true;
 	man->size = p_size;
 
 	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
 		INIT_LIST_HEAD(&man->lru[i]);
 	man->move = NULL;
+}
+EXPORT_SYMBOL(ttm_mem_type_manager_init);
 
+int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
+			unsigned long p_size)
+{
+	int ret;
+	struct ttm_mem_type_manager *man;
+
+	BUG_ON(type >= TTM_NUM_MEM_TYPES);
+	ttm_mem_type_manager_init(bdev, &bdev->man[type], p_size);
+
+	if (type != TTM_PL_SYSTEM) {
+		ret = (*man->func->init)(man, p_size);
+		if (ret)
+			return ret;
+	}
+	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
 EXPORT_SYMBOL(ttm_bo_init_mm);
include/drm/ttm/ttm_bo_api.h +15 -0
index a9e13b252820..89053e761a69 100644
@@ -54,6 +54,8 @@ struct ttm_place;
 
 struct ttm_lru_bulk_move;
 
+struct ttm_mem_type_manager;
+
 /**
  * struct ttm_bus_placement
  *
@@ -531,6 +533,19 @@ int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size,
 		  uint32_t page_alignment, bool interruptible,
 		  struct ttm_buffer_object **p_bo);
 
+/**
+ * ttm_mem_type_manager_init
+ *
+ * @bdev: Pointer to a ttm_bo_device struct.
+ * @man: memory manager object to init
+ * @p_size: size managed area in pages.
+ *
+ * Initialise core parts of a a manager object.
+ */
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+			       struct ttm_mem_type_manager *man,
+			       unsigned long p_size);
+
 /**
  * ttm_bo_init_mm
  *
include/drm/ttm/ttm_bo_driver.h +15 -0
index 73f5d9c766cc..6b49c0356343 100644
@@ -678,6 +678,21 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
 	dma_resv_unlock(bo->base.resv);
 }
 
+/**
+ * ttm_mem_type_manager_set_used
+ *
+ * @man: A memory manager object.
+ * @used: usage state to set.
+ *
+ * Set the manager in use flag. If disabled the manager is no longer
+ * used for object placement.
+ */
+static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *man, bool used)
+{
+	man->has_type = true;
+	man->use_type = used;
+}
+
 /*
  * ttm_bo_util.c
  */
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 13/59
#28 lore raw

Re: [PATCH 13/59] drm/ttm: split the mm manager init code (v2)

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 10 lines

From: Dave Airlie <[email protected]>

This will allow the driver to control the ordering here better.

Eventually the old path will be removed.

v2: add docs for new APIs.
rename new path to ttm_mem_type_manager_init/set_used(for now)

Quoted 115 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    | 34 +++++++++++++++++++--------------
  include/drm/ttm/ttm_bo_api.h    | 15 +++++++++++++++
  include/drm/ttm/ttm_bo_driver.h | 15 +++++++++++++++
  3 files changed, 50 insertions(+), 14 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +20 -14
index 2ac70ec1f37d..300bcc10696a 100644
@@ -1509,35 +1509,41 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  }
  EXPORT_SYMBOL(ttm_bo_evict_mm);
 
-int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-			unsigned long p_size)
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+			       struct ttm_mem_type_manager *man,
+			       unsigned long p_size)
  {
-	int ret;
-	struct ttm_mem_type_manager *man;
  	unsigned i;
 
-	BUG_ON(type >= TTM_NUM_MEM_TYPES);
-	man = &bdev->man[type];
  	BUG_ON(man->has_type);
  	man->use_io_reserve_lru = false;
  	mutex_init(&man->io_reserve_mutex);
  	spin_lock_init(&man->move_lock);
  	INIT_LIST_HEAD(&man->io_reserve_lru);
  	man->bdev = bdev;
-
-	if (type != TTM_PL_SYSTEM) {
-		ret = (*man->func->init)(man, p_size);
-		if (ret)
-			return ret;
-	}
-	man->has_type = true;
-	man->use_type = true;
  	man->size = p_size;
 
  	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
  		INIT_LIST_HEAD(&man->lru[i]);
  	man->move = NULL;
+}
+EXPORT_SYMBOL(ttm_mem_type_manager_init);
 
+int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
+			unsigned long p_size)
+{
+	int ret;
+	struct ttm_mem_type_manager *man;
+
+	BUG_ON(type >= TTM_NUM_MEM_TYPES);
+	ttm_mem_type_manager_init(bdev, &bdev->man[type], p_size);
+
+	if (type != TTM_PL_SYSTEM) {
+		ret = (*man->func->init)(man, p_size);
+		if (ret)
+			return ret;
+	}
+	ttm_mem_type_manager_set_used(man, true);
  	return 0;
  }
  EXPORT_SYMBOL(ttm_bo_init_mm);
include/drm/ttm/ttm_bo_api.h +15 -0
index a9e13b252820..89053e761a69 100644
@@ -54,6 +54,8 @@ struct ttm_place;
 
  struct ttm_lru_bulk_move;
 
+struct ttm_mem_type_manager;
+
  /**
   * struct ttm_bus_placement
   *
@@ -531,6 +533,19 @@ int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size,
  		  uint32_t page_alignment, bool interruptible,
  		  struct ttm_buffer_object **p_bo);
 
+/**
+ * ttm_mem_type_manager_init
+ *
+ * @bdev: Pointer to a ttm_bo_device struct.
+ * @man: memory manager object to init
+ * @p_size: size managed area in pages.
+ *
+ * Initialise core parts of a a manager object.
+ */
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+			       struct ttm_mem_type_manager *man,
+			       unsigned long p_size);
+
  /**
   * ttm_bo_init_mm
   *
include/drm/ttm/ttm_bo_driver.h +8 -0
index 73f5d9c766cc..6b49c0356343 100644
@@ -678,6 +678,21 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
  	dma_resv_unlock(bo->base.resv);
  }
 
+/**
+ * ttm_mem_type_manager_set_used
+ *
+ * @man: A memory manager object.
+ * @used: usage state to set.
+ *
+ * Set the manager in use flag. If disabled the manager is no longer
+ * used for object placement.

include/drm/ttm/ttm_bo_driver.h static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo) · line 698

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7 -0
+ */
+static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *man, bool used)
+{
+	man->has_type = true;
+	man->use_type = used;
+}
+
  /*
   * ttm_bo_util.c
   */

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

maintainer
#29 lore raw

Re: [PATCH 13/59] drm/ttm: split the mm manager init code (v2)

Am 04.08.20 um 13:07 schrieb Christian König:

Quoted 5 lines

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 4 lines

From: Dave Airlie <[email protected]>

This will allow the driver to control the ordering here better.

Quoted 8 lines
Quoted 6 lines

Eventually the old path will be removed.

v2: add docs for new APIs.
rename new path to ttm_mem_type_manager_init/set_used(for now)

BTW: I've just noticed that you (most likely) accidentally added a tab after every use of ttm_mem_type_manager_set_used() in the follow up patches.

Not sure where this is coming from, but it annoys checkpatch quite a bit :)

Christian.

Quoted 114 lines
Quoted 114 lines

---
  drivers/gpu/drm/ttm/ttm_bo.c    | 34 +++++++++++++++++++-------------- include/drm/ttm/ttm_bo_api.h    | 15 +++++++++++++++ include/drm/ttm/ttm_bo_driver.h | 15 +++++++++++++++

  3 files changed, 50 insertions(+), 14 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +19 -12
index 2ac70ec1f37d..300bcc10696a 100644
@@ -1509,35 +1509,41 @@ int ttm_bo_evict_mm(struct ttm_bo_device 
 *bdev, unsigned mem_type)
   }
   EXPORT_SYMBOL(ttm_bo_evict_mm);
   -int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-            unsigned long p_size)
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+                   struct ttm_mem_type_manager *man,
+                   unsigned long p_size)
   {
-    int ret;
-    struct ttm_mem_type_manager *man;
       unsigned i;
   -    BUG_ON(type >= TTM_NUM_MEM_TYPES);
-    man = &bdev->man[type];
       BUG_ON(man->has_type);
       man->use_io_reserve_lru = false;
       mutex_init(&man->io_reserve_mutex);
       spin_lock_init(&man->move_lock);
       INIT_LIST_HEAD(&man->io_reserve_lru);
       man->bdev = bdev;
-
-    if (type != TTM_PL_SYSTEM) {
-        ret = (*man->func->init)(man, p_size);
-        if (ret)
-            return ret;
-    }
-    man->has_type = true;
-    man->use_type = true;
       man->size = p_size;
         for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
           INIT_LIST_HEAD(&man->lru[i]);
       man->move = NULL;
+}
+EXPORT_SYMBOL(ttm_mem_type_manager_init);
   +int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
+            unsigned long p_size)
+{
+    int ret;
+    struct ttm_mem_type_manager *man;
+
+    BUG_ON(type >= TTM_NUM_MEM_TYPES);
+    ttm_mem_type_manager_init(bdev, &bdev->man[type], p_size);
+
+    if (type != TTM_PL_SYSTEM) {
+        ret = (*man->func->init)(man, p_size);
+        if (ret)
+            return ret;
+    }
+    ttm_mem_type_manager_set_used(man, true);
       return 0;
   }
   EXPORT_SYMBOL(ttm_bo_init_mm);
include/drm/ttm/ttm_bo_api.h +1 -0
index a9e13b252820..89053e761a69 100644
@@ -54,6 +54,8 @@ struct ttm_place;
     struct ttm_lru_bulk_move;
   +struct ttm_mem_type_manager;
+
   /**
    * struct ttm_bus_placement
    *
@@ -531,6 +533,19 @@ int ttm_bo_create(struct ttm_bo_device *bdev, 
 unsigned long size,
             uint32_t page_alignment, bool interruptible,
             struct ttm_buffer_object **p_bo);

  +/**
+ * ttm_mem_type_manager_init
+ *
+ * @bdev: Pointer to a ttm_bo_device struct.
+ * @man: memory manager object to init
+ * @p_size: size managed area in pages.
+ *
+ * Initialise core parts of a a manager object.
+ */

include/drm/ttm/ttm_bo_api.h +4 -0
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+                   struct ttm_mem_type_manager *man,
+                   unsigned long p_size);
+

  /**
   * ttm_bo_init_mm
   *

include/drm/ttm/ttm_bo_driver.h +0 -0
index 73f5d9c766cc..6b49c0356343 100644
@@ -678,6 +678,21 @@ static inline void ttm_bo_unreserve(struct 
 ttm_buffer_object *bo)
       dma_resv_unlock(bo->base.resv);
   }

  +/**
+ * ttm_mem_type_manager_set_used
+ *
+ * @man: A memory manager object.
+ * @used: usage state to set.
+ *
+ * Set the manager in use flag. If disabled the manager is no longer
+ * used for object placement.
+ */
+static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *man, bool used)

Quoted 9 lines
Quoted 8 lines
include/drm/ttm/ttm_bo_driver.h +5 -0
+{
+    man->has_type = true;
+    man->use_type = used;
+}
+

  /*
   * ttm_bo_util.c
   */

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

maintainer
#30 lore raw

Re: [PATCH 13/59] drm/ttm: split the mm manager init code (v2)

In reply to Dave Airlie

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 92 lines

From: Dave Airlie <[email protected]>

This will allow the driver to control the ordering here better.

Eventually the old path will be removed.

v2: add docs for new APIs.
rename new path to ttm_mem_type_manager_init/set_used(for now)

---
  drivers/gpu/drm/ttm/ttm_bo.c    | 34 +++++++++++++++++++--------------
  include/drm/ttm/ttm_bo_api.h    | 15 +++++++++++++++
  include/drm/ttm/ttm_bo_driver.h | 15 +++++++++++++++
  3 files changed, 50 insertions(+), 14 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +20 -14
index 2ac70ec1f37d..300bcc10696a 100644
@@ -1509,35 +1509,41 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  }
  EXPORT_SYMBOL(ttm_bo_evict_mm);
 
-int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-			unsigned long p_size)
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+			       struct ttm_mem_type_manager *man,
+			       unsigned long p_size)
  {
-	int ret;
-	struct ttm_mem_type_manager *man;
  	unsigned i;
 
-	BUG_ON(type >= TTM_NUM_MEM_TYPES);
-	man = &bdev->man[type];
  	BUG_ON(man->has_type);
  	man->use_io_reserve_lru = false;
  	mutex_init(&man->io_reserve_mutex);
  	spin_lock_init(&man->move_lock);
  	INIT_LIST_HEAD(&man->io_reserve_lru);
  	man->bdev = bdev;
-
-	if (type != TTM_PL_SYSTEM) {
-		ret = (*man->func->init)(man, p_size);
-		if (ret)
-			return ret;
-	}
-	man->has_type = true;
-	man->use_type = true;
  	man->size = p_size;
 
  	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
  		INIT_LIST_HEAD(&man->lru[i]);
  	man->move = NULL;
+}
+EXPORT_SYMBOL(ttm_mem_type_manager_init);
 
+int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
+			unsigned long p_size)
+{
+	int ret;
+	struct ttm_mem_type_manager *man;
+
+	BUG_ON(type >= TTM_NUM_MEM_TYPES);
+	ttm_mem_type_manager_init(bdev, &bdev->man[type], p_size);
+
+	if (type != TTM_PL_SYSTEM) {
+		ret = (*man->func->init)(man, p_size);
+		if (ret)
+			return ret;
+	}
+	ttm_mem_type_manager_set_used(man, true);
  	return 0;
  }
  EXPORT_SYMBOL(ttm_bo_init_mm);
include/drm/ttm/ttm_bo_api.h +2 -0
index a9e13b252820..89053e761a69 100644
@@ -54,6 +54,8 @@ struct ttm_place;
 
  struct ttm_lru_bulk_move;
 
+struct ttm_mem_type_manager;
+
  /**
   * struct ttm_bus_placement
   *
@@ -531,6 +533,19 @@ int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size,
  		  uint32_t page_alignment, bool interruptible,
  		  struct ttm_buffer_object **p_bo);

include/drm/ttm/ttm_bo_api.h int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size, · line 544

Quoted 10 lines
include/drm/ttm/ttm_bo_api.h +9 -0
 
+/**
+ * ttm_mem_type_manager_init
+ *
+ * @bdev: Pointer to a ttm_bo_device struct.
+ * @man: memory manager object to init
+ * @p_size: size managed area in pages.
+ *
+ * Initialise core parts of a a manager object.
+ */

As far as I know we usually have the documentation on the function instead of the prototype in the Linux kernel.

Christian.

Quoted 23 lines
include/drm/ttm/ttm_bo_api.h +4 -0
+void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
+			       struct ttm_mem_type_manager *man,
+			       unsigned long p_size);
+
  /**
   * ttm_bo_init_mm
   *
include/drm/ttm/ttm_bo_driver.h +8 -0
index 73f5d9c766cc..6b49c0356343 100644
@@ -678,6 +678,21 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
  	dma_resv_unlock(bo->base.resv);
  }
 
+/**
+ * ttm_mem_type_manager_set_used
+ *
+ * @man: A memory manager object.
+ * @used: usage state to set.
+ *
+ * Set the manager in use flag. If disabled the manager is no longer
+ * used for object placement.

include/drm/ttm/ttm_bo_driver.h static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo) · line 698

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7 -0
+ */
+static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *man, bool used)
+{
+	man->has_type = true;
+	man->use_type = used;
+}
+
  /*
   * ttm_bo_util.c
   */

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

author maintainer
#31 lore raw

PATCH 14/59 drm/ttm: provide a driver-led init path for range mm manager. (v2)

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This lets the generic range mm manager be initialised by the driver.

v2: add docs.
rename api to range_man_init for now.

---
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 23 ++++++++++++++++++++---
 include/drm/ttm/ttm_bo_driver.h      | 14 ++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_manager.c +20 -3
index facd3049c3aa..eb86c8694f47 100644
@@ -104,8 +104,8 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
 	}
 }
 
-static int ttm_bo_man_init(struct ttm_mem_type_manager *man,
-			   unsigned long p_size)
+static int ttm_bo_man_init_private(struct ttm_mem_type_manager *man,
+				   unsigned long p_size)
 {
 	struct ttm_range_manager *rman;
 
@@ -119,6 +119,23 @@ static int ttm_bo_man_init(struct ttm_mem_type_manager *man,
 	return 0;
 }
 
+int ttm_range_man_init(struct ttm_bo_device *bdev,
+		       struct ttm_mem_type_manager *man,
+		       unsigned long p_size)
+{
+	int ret;
+
+	man->func = &ttm_bo_manager_func;
+
+	ttm_mem_type_manager_init(bdev, man, p_size);
+	ret = ttm_bo_man_init_private(man, p_size);
+	if (ret)
+		return ret;
+	ttm_mem_type_manager_set_used(man, true);
+	return 0;
+}
+EXPORT_SYMBOL(ttm_range_man_init);
+
 static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
 {
 	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
@@ -147,7 +164,7 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-	.init = ttm_bo_man_init,
+	.init = ttm_bo_man_init_private,
 	.takedown = ttm_bo_man_takedown,
 	.get_node = ttm_bo_man_get_node,
 	.put_node = ttm_bo_man_put_node,
include/drm/ttm/ttm_bo_driver.h +14 -0
index 6b49c0356343..3672dea3edca 100644
@@ -808,6 +808,20 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo);
  */
 pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
 
+/**
+ * ttm_range_man_init
+ *
+ * @bdev: ttm device
+ * @man: the manager to initialise with the range manager.
+ * @p_size: size of area to be managed in pages.
+ *
+ * Initialise a generic range manager for the selected memory type.
+ * The range manager is installed for this device in the type slot.
+ */
+int ttm_range_man_init(struct ttm_bo_device *bdev,
+		       struct ttm_mem_type_manager *man,
+		       unsigned long p_size);
+
 extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 
 /**
Signature · 6 lines
2.26.2

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

PATCH 15/59 drm/amdgpu/ttm: init managers from the driver side.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Use new init calls to unwrap manager init

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 19 ++++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c      | 37 +++-----------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h      |  4 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 19 ++++++----
 4 files changed, 33 insertions(+), 46 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +13 -6
index 77fae40197ab..9d05e1ab2048 100644
@@ -76,6 +76,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
 static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
 	           amdgpu_mem_info_gtt_used_show, NULL);
 
+static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
 /**
  * amdgpu_gtt_mgr_init - init GTT manager and DRM MM
  *
@@ -84,14 +85,20 @@ static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
  *
  * Allocate and initialize the GTT manager.
  */
-static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
-			       unsigned long p_size)
+int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
 	struct amdgpu_gtt_mgr *mgr;
 	uint64_t start, size;
 	int ret;
 
+	man->use_tt = true;
+	man->func = &amdgpu_gtt_mgr_func;
+	man->available_caching = TTM_PL_MASK_CACHING;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+
+	ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
+
 	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
 	if (!mgr)
 		return -ENOMEM;
@@ -100,7 +107,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
 	size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
 	drm_mm_init(&mgr->mm, start, size);
 	spin_lock_init(&mgr->lock);
-	atomic64_set(&mgr->available, p_size);
+	atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
 	man->priv = mgr;
 
 	ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
@@ -114,6 +121,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
 		return ret;
 	}
 
+	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
 
@@ -298,8 +306,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
 		   amdgpu_gtt_mgr_usage(man) >> 20);
 }
 
-const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
-	.init = amdgpu_gtt_mgr_init,
+static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
 	.takedown = amdgpu_gtt_mgr_fini,
 	.get_node = amdgpu_gtt_mgr_new,
 	.put_node = amdgpu_gtt_mgr_del,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -32
index d3e3cad4d0cb..4a09a625e748 100644
@@ -63,43 +63,16 @@
 
 #define AMDGPU_TTM_VRAM_MAX_DW_READ	(size_t)128
 
-static int amdgpu_ttm_init_vram(struct amdgpu_device *adev)
-{
-
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
-
-	man->func = &amdgpu_vram_mgr_func;
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-
-	return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_VRAM,
-			      adev->gmc.real_vram_size >> PAGE_SHIFT);
-}
-
-static int amdgpu_ttm_init_gtt(struct amdgpu_device *adev, uint64_t gtt_size)
-{
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
-
-	man->use_tt = true;
-	man->func = &amdgpu_gtt_mgr_func;
-	man->available_caching = TTM_PL_MASK_CACHING;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-
-	return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT,
-			      gtt_size >> PAGE_SHIFT);
-}
-
 static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
-				   unsigned int type,
-				   uint64_t size)
+				    unsigned int type,
+				    uint64_t size)
 {
 	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[type];
 
-	man->func = &ttm_bo_manager_func;
 	man->available_caching = TTM_PL_FLAG_UNCACHED;
 	man->default_caching = TTM_PL_FLAG_UNCACHED;
 
-	return ttm_bo_init_mm(&adev->mman.bdev, type, size);
+	return ttm_range_man_init(&adev->mman.bdev, man, size >> PAGE_SHIFT);
 }
 
 /**
@@ -1915,7 +1888,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
 	adev->mman.bdev.no_retry = true;
 
 	/* Initialize VRAM pool with all of VRAM divided into pages */
-	r = amdgpu_ttm_init_vram(adev);
+	r = amdgpu_vram_mgr_init(adev);
 	if (r) {
 		DRM_ERROR("Failed initializing VRAM heap.\n");
 		return r;
@@ -1982,7 +1955,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
 		gtt_size = (uint64_t)amdgpu_gtt_size << 20;
 
 	/* Initialize GTT memory pool */
-	r = amdgpu_ttm_init_gtt(adev, gtt_size);
+	r = amdgpu_gtt_mgr_init(adev, gtt_size);
 	if (r) {
 		DRM_ERROR("Failed initializing GTT heap.\n");
 		return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +2 -2
index 17c8d0d7bcc3..fb45c0a323b0 100644
@@ -67,8 +67,8 @@ struct amdgpu_copy_mem {
 	unsigned long			offset;
 };
 
-extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
-extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
+int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size);
+int amdgpu_vram_mgr_init(struct amdgpu_device *adev);
 
 bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem);
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +13 -6
index 134cc36e30c5..bef3497de2ae 100644
@@ -158,6 +158,8 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
 	NULL
 };
 
+static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
+
 /**
  * amdgpu_vram_mgr_init - init VRAM manager and DRM MM
  *
@@ -166,18 +168,23 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
  *
  * Allocate and initialize the VRAM manager.
  */
-static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
-				unsigned long p_size)
+int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
 	struct amdgpu_vram_mgr *mgr;
 	int ret;
 
+	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+	man->default_caching = TTM_PL_FLAG_WC;
+
+	ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
+
+	man->func = &amdgpu_vram_mgr_func;
 	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
 	if (!mgr)
 		return -ENOMEM;
 
-	drm_mm_init(&mgr->mm, 0, p_size);
+	drm_mm_init(&mgr->mm, 0, man->size);
 	spin_lock_init(&mgr->lock);
 	man->priv = mgr;
 
@@ -186,6 +193,7 @@ static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
 	if (ret)
 		DRM_ERROR("Failed to register sysfs\n");
 
+	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
 
@@ -587,8 +595,7 @@ static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
 		   amdgpu_vram_mgr_vis_usage(man) >> 20);
 }
 
-const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
-	.init		= amdgpu_vram_mgr_init,
+static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
 	.takedown	= amdgpu_vram_mgr_fini,
 	.get_node	= amdgpu_vram_mgr_new,
 	.put_node	= amdgpu_vram_mgr_del,
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 15/59
#33 lore raw

Re: [PATCH 15/59] drm/amdgpu/ttm: init managers from the driver side.

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

Use new init calls to unwrap manager init

Quoted 204 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 19 ++++++----
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c      | 37 +++-----------------
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h      |  4 +--
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 19 ++++++----
  4 files changed, 33 insertions(+), 46 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +13 -6
index 77fae40197ab..9d05e1ab2048 100644
@@ -76,6 +76,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
  static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
  	           amdgpu_mem_info_gtt_used_show, NULL);
 
+static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
  /**
   * amdgpu_gtt_mgr_init - init GTT manager and DRM MM
   *
@@ -84,14 +85,20 @@ static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
   *
   * Allocate and initialize the GTT manager.
   */
-static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
-			       unsigned long p_size)
+int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
  {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
  	struct amdgpu_gtt_mgr *mgr;
  	uint64_t start, size;
  	int ret;
 
+	man->use_tt = true;
+	man->func = &amdgpu_gtt_mgr_func;
+	man->available_caching = TTM_PL_MASK_CACHING;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+
+	ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
+
  	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
  	if (!mgr)
  		return -ENOMEM;
@@ -100,7 +107,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
  	size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
  	drm_mm_init(&mgr->mm, start, size);
  	spin_lock_init(&mgr->lock);
-	atomic64_set(&mgr->available, p_size);
+	atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
  	man->priv = mgr;
 
  	ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
@@ -114,6 +121,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
  		return ret;
  	}
 
+	ttm_mem_type_manager_set_used(man, true);
  	return 0;
  }
 
@@ -298,8 +306,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
  		   amdgpu_gtt_mgr_usage(man) >> 20);
  }
 
-const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
-	.init = amdgpu_gtt_mgr_init,
+static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
  	.takedown = amdgpu_gtt_mgr_fini,
  	.get_node = amdgpu_gtt_mgr_new,
  	.put_node = amdgpu_gtt_mgr_del,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -32
index d3e3cad4d0cb..4a09a625e748 100644
@@ -63,43 +63,16 @@
 
  #define AMDGPU_TTM_VRAM_MAX_DW_READ	(size_t)128
 
-static int amdgpu_ttm_init_vram(struct amdgpu_device *adev)
-{
-
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
-
-	man->func = &amdgpu_vram_mgr_func;
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-
-	return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_VRAM,
-			      adev->gmc.real_vram_size >> PAGE_SHIFT);
-}
-
-static int amdgpu_ttm_init_gtt(struct amdgpu_device *adev, uint64_t gtt_size)
-{
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
-
-	man->use_tt = true;
-	man->func = &amdgpu_gtt_mgr_func;
-	man->available_caching = TTM_PL_MASK_CACHING;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-
-	return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT,
-			      gtt_size >> PAGE_SHIFT);
-}
-
  static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
-				   unsigned int type,
-				   uint64_t size)
+				    unsigned int type,
+				    uint64_t size)
  {
  	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[type];
 
-	man->func = &ttm_bo_manager_func;
  	man->available_caching = TTM_PL_FLAG_UNCACHED;
  	man->default_caching = TTM_PL_FLAG_UNCACHED;
 
-	return ttm_bo_init_mm(&adev->mman.bdev, type, size);
+	return ttm_range_man_init(&adev->mman.bdev, man, size >> PAGE_SHIFT);
  }
 
  /**
@@ -1915,7 +1888,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
  	adev->mman.bdev.no_retry = true;
 
  	/* Initialize VRAM pool with all of VRAM divided into pages */
-	r = amdgpu_ttm_init_vram(adev);
+	r = amdgpu_vram_mgr_init(adev);
  	if (r) {
  		DRM_ERROR("Failed initializing VRAM heap.\n");
  		return r;
@@ -1982,7 +1955,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
  		gtt_size = (uint64_t)amdgpu_gtt_size << 20;
 
  	/* Initialize GTT memory pool */
-	r = amdgpu_ttm_init_gtt(adev, gtt_size);
+	r = amdgpu_gtt_mgr_init(adev, gtt_size);
  	if (r) {
  		DRM_ERROR("Failed initializing GTT heap.\n");
  		return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +2 -2
index 17c8d0d7bcc3..fb45c0a323b0 100644
@@ -67,8 +67,8 @@ struct amdgpu_copy_mem {
  	unsigned long			offset;
  };
 
-extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
-extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
+int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size);
+int amdgpu_vram_mgr_init(struct amdgpu_device *adev);
 
  bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem);
  uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +12 -4
index 134cc36e30c5..bef3497de2ae 100644
@@ -158,6 +158,8 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
  	NULL
  };
 
+static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
+
  /**
   * amdgpu_vram_mgr_init - init VRAM manager and DRM MM
   *
@@ -166,18 +168,23 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
   *
   * Allocate and initialize the VRAM manager.
   */
-static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
-				unsigned long p_size)
+int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
  {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
  	struct amdgpu_vram_mgr *mgr;
  	int ret;
 
+	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+	man->default_caching = TTM_PL_FLAG_WC;
+
+	ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
+
+	man->func = &amdgpu_vram_mgr_func;
  	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
  	if (!mgr)
  		return -ENOMEM;
 
-	drm_mm_init(&mgr->mm, 0, p_size);
+	drm_mm_init(&mgr->mm, 0, man->size);
  	spin_lock_init(&mgr->lock);
  	man->priv = mgr;
 
@@ -186,6 +193,7 @@ static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
  	if (ret)
  		DRM_ERROR("Failed to register sysfs\n");
 
+	ttm_mem_type_manager_set_used(man, true);
  	return 0;
  }
 

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man, · line 601

Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -2
@@ -587,8 +595,7 @@ static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
  		   amdgpu_vram_mgr_vis_usage(man) >> 20);
  }
 
-const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
-	.init		= amdgpu_vram_mgr_init,
+static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
  	.takedown	= amdgpu_vram_mgr_fini,
  	.get_node	= amdgpu_vram_mgr_new,
  	.put_node	= amdgpu_vram_mgr_del,

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

author maintainer
#34 lore raw

PATCH 16/59 drm/radeon: use new ttm man init path

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Use the new common manager init path.

---
 drivers/gpu/drm/radeon/radeon_ttm.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +4 -6
index 0b07d8ed6edd..84c02b4529c0 100644
@@ -70,19 +70,17 @@ static int radeon_ttm_init_vram(struct radeon_device *rdev)
 {
 	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_VRAM];
 
-	man->func = &ttm_bo_manager_func;
 	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
 	man->default_caching = TTM_PL_FLAG_WC;
 
-	return ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_VRAM,
-			      rdev->mc.real_vram_size >> PAGE_SHIFT);
+	return ttm_range_man_init(&rdev->mman.bdev, man,
+				  rdev->mc.real_vram_size >> PAGE_SHIFT);
 }
 
 static int radeon_ttm_init_gtt(struct radeon_device *rdev)
 {
 	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_TT];
 
-	man->func = &ttm_bo_manager_func;
 	man->available_caching = TTM_PL_MASK_CACHING;
 	man->default_caching = TTM_PL_FLAG_CACHED;
 	man->use_tt = true;
@@ -98,8 +96,8 @@ static int radeon_ttm_init_gtt(struct radeon_device *rdev)
 	}
 #endif
 
-	return ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT,
-			      rdev->mc.gtt_size >> PAGE_SHIFT);
+	return ttm_range_man_init(&rdev->mman.bdev, man,
+				  rdev->mc.gtt_size >> PAGE_SHIFT);
 }
 
 static void radeon_evict_flags(struct ttm_buffer_object *bo,
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 16/59
#35 lore raw

Re: [PATCH 16/59] drm/radeon: use new ttm man init path

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

Use the new common manager init path.

Quoted 31 lines
---
  drivers/gpu/drm/radeon/radeon_ttm.c | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +2 -4
index 0b07d8ed6edd..84c02b4529c0 100644
@@ -70,19 +70,17 @@ static int radeon_ttm_init_vram(struct radeon_device *rdev)
  {
  	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_VRAM];
 
-	man->func = &ttm_bo_manager_func;
  	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
  	man->default_caching = TTM_PL_FLAG_WC;
 
-	return ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_VRAM,
-			      rdev->mc.real_vram_size >> PAGE_SHIFT);
+	return ttm_range_man_init(&rdev->mman.bdev, man,
+				  rdev->mc.real_vram_size >> PAGE_SHIFT);
  }
 
  static int radeon_ttm_init_gtt(struct radeon_device *rdev)
  {
  	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_TT];
 
-	man->func = &ttm_bo_manager_func;
  	man->available_caching = TTM_PL_MASK_CACHING;
  	man->default_caching = TTM_PL_FLAG_CACHED;
  	man->use_tt = true;

drivers/gpu/drm/radeon/radeon_ttm.c static int radeon_ttm_init_gtt(struct radeon_device *rdev) · line 103

Quoted 10 lines
drivers/gpu/drm/radeon/radeon_ttm.c +2 -2
@@ -98,8 +96,8 @@ static int radeon_ttm_init_gtt(struct radeon_device *rdev)
  	}
  #endif
 
-	return ttm_bo_init_mm(&rdev->mman.bdev, TTM_PL_TT,
-			      rdev->mc.gtt_size >> PAGE_SHIFT);
+	return ttm_range_man_init(&rdev->mman.bdev, man,
+				  rdev->mc.gtt_size >> PAGE_SHIFT);
  }
 
  static void radeon_evict_flags(struct ttm_buffer_object *bo,

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

author maintainer
#36 lore raw

PATCH 17/59 drm/qxl/ttm: use new init path for manager

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/qxl/qxl_ttm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +1 -2
index 3e664bb58764..bfbd2c5c38a2 100644
@@ -221,11 +221,10 @@ static int qxl_ttm_init_mem_type(struct qxl_device *qdev,
 {
 	struct ttm_mem_type_manager *man = &qdev->mman.bdev.man[type];
 
-	man->func = &ttm_bo_manager_func;
 	man->available_caching = TTM_PL_MASK_CACHING;
 	man->default_caching = TTM_PL_FLAG_CACHED;
 
-	return ttm_bo_init_mm(&qdev->mman.bdev, type, size);
+	return ttm_range_man_init(&qdev->mman.bdev, man, size);
 }
 
 int qxl_ttm_init(struct qxl_device *qdev)
Signature · 6 lines
2.26.2

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

PATCH 18/59 drm/vram_helper: use new ttm manager init function

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/drm_gem_vram_helper.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +1 -2
index c20aee2fddf3..d7c0fdf82eb6 100644
@@ -1116,10 +1116,9 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 	if (ret)
 		return ret;
 
-	man->func = &ttm_bo_manager_func;
 	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
 	man->default_caching = TTM_PL_FLAG_WC;
-	ret = ttm_bo_init_mm(&vmm->bdev, TTM_PL_VRAM, vram_size >> PAGE_SHIFT);
+	ret = ttm_range_man_init(&vmm->bdev, man, vram_size >> PAGE_SHIFT);
 	if (ret)
 		return ret;
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 18/59
#39 lore raw

Re: [PATCH 18/59] drm/vram_helper: use new ttm manager init function

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 3 lines

From: Dave Airlie <[email protected]>

Quoted 21 lines
---
 drivers/gpu/drm/drm_gem_vram_helper.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +1 -2
index c20aee2fddf3..d7c0fdf82eb6 100644
@@ -1116,10 +1116,9 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 	if (ret)
 		return ret;
 
-	man->func = &ttm_bo_manager_func;
 	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
 	man->default_caching = TTM_PL_FLAG_WC;
-	ret = ttm_bo_init_mm(&vmm->bdev, TTM_PL_VRAM, vram_size >> PAGE_SHIFT);
+	ret = ttm_range_man_init(&vmm->bdev, man, vram_size >> PAGE_SHIFT);
 	if (ret)
 		return ret;
 
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

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

author maintainer
#41 lore raw

PATCH 19/59 drm/nouveau: use new memory manager init paths

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 43 ++++++++++++---------------
 1 file changed, 19 insertions(+), 24 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +19 -24
index 6de762a0c229..cfcbecd332ef 100644
@@ -31,12 +31,6 @@
 
 #include <core/tegra.h>
 
-static int
-nouveau_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)
-{
-	return 0;
-}
-
 static int
 nouveau_manager_fini(struct ttm_mem_type_manager *man)
 {
@@ -76,7 +70,6 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
-	.init = nouveau_manager_init,
 	.takedown = nouveau_manager_fini,
 	.get_node = nouveau_vram_manager_new,
 	.put_node = nouveau_manager_del,
@@ -101,7 +94,6 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
-	.init = nouveau_manager_init,
 	.takedown = nouveau_manager_fini,
 	.get_node = nouveau_gart_manager_new,
 	.put_node = nouveau_manager_del,
@@ -135,7 +127,6 @@ nv04_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nv04_gart_manager = {
-	.init = nouveau_manager_init,
 	.takedown = nouveau_manager_fini,
 	.get_node = nv04_gart_manager_new,
 	.put_node = nouveau_manager_del,
@@ -191,27 +182,21 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 
 		man->func = &nouveau_vram_manager;
 		man->use_io_reserve_lru = true;
+		ttm_mem_type_manager_init(&drm->ttm.bdev, man,
+					  drm->gem.vram_available >> PAGE_SHIFT);
+		ttm_mem_type_manager_set_used(man, true);
+		return 0;
 	} else {
-		man->func = &ttm_bo_manager_func;
+		return ttm_range_man_init(&drm->ttm.bdev, man,
+					  drm->gem.vram_available >> PAGE_SHIFT);
 	}
-
-	return ttm_bo_init_mm(&drm->ttm.bdev, TTM_PL_VRAM,
-			      drm->gem.vram_available >> PAGE_SHIFT);
 }
 
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
 	struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
-
-	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
-		man->func = &nouveau_gart_manager;
-	else
-	if (!drm->agp.bridge)
-		man->func = &nv04_gart_manager;
-	else
-		man->func = &ttm_bo_manager_func;
-
+	unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
 	man->use_tt = true;
 	if (drm->agp.bridge) {
 		man->available_caching = TTM_PL_FLAG_UNCACHED |
@@ -222,8 +207,18 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 		man->default_caching = TTM_PL_FLAG_CACHED;
 	}
 
-	return ttm_bo_init_mm(&drm->ttm.bdev, TTM_PL_TT,
-			      drm->gem.gart_available >> PAGE_SHIFT);
+	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
+		man->func = &nouveau_gart_manager;
+	else if (!drm->agp.bridge)
+		man->func = &nv04_gart_manager;
+	else
+		return ttm_range_man_init(&drm->ttm.bdev, man,
+					  size_pages);
+
+	ttm_mem_type_manager_init(&drm->ttm.bdev, man,
+				  size_pages);
+	ttm_mem_type_manager_set_used(man, true);
+	return 0;
 }
 
 int
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 19/59
#42 lore raw

Re: [PATCH 19/59] drm/nouveau: use new memory manager init paths

Quoted 4 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 104 lines
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 43 ++++++++++++---------------
 1 file changed, 19 insertions(+), 24 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +19 -25
index 6de762a0c229..cfcbecd332ef 100644
@@ -31,12 +31,6 @@
 
 #include <core/tegra.h>
 
-static int
-nouveau_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)
-{
-       return 0;
-}
-
 static int
 nouveau_manager_fini(struct ttm_mem_type_manager *man)
 {
@@ -76,7 +70,6 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
-       .init = nouveau_manager_init,
        .takedown = nouveau_manager_fini,
        .get_node = nouveau_vram_manager_new,
        .put_node = nouveau_manager_del,
@@ -101,7 +94,6 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
-       .init = nouveau_manager_init,
        .takedown = nouveau_manager_fini,
        .get_node = nouveau_gart_manager_new,
        .put_node = nouveau_manager_del,
@@ -135,7 +127,6 @@ nv04_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nv04_gart_manager = {
-       .init = nouveau_manager_init,
        .takedown = nouveau_manager_fini,
        .get_node = nv04_gart_manager_new,
        .put_node = nouveau_manager_del,
@@ -191,27 +182,21 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 
                man->func = &nouveau_vram_manager;
                man->use_io_reserve_lru = true;
+               ttm_mem_type_manager_init(&drm->ttm.bdev, man,
+                                         drm->gem.vram_available >> PAGE_SHIFT);
+               ttm_mem_type_manager_set_used(man, true);
+               return 0;
        } else {
-               man->func = &ttm_bo_manager_func;
+               return ttm_range_man_init(&drm->ttm.bdev, man,
+                                         drm->gem.vram_available >> PAGE_SHIFT);
        }
-
-       return ttm_bo_init_mm(&drm->ttm.bdev, TTM_PL_VRAM,
-                             drm->gem.vram_available >> PAGE_SHIFT);
 }
 
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
        struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
-
-       if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
-               man->func = &nouveau_gart_manager;
-       else
-       if (!drm->agp.bridge)
-               man->func = &nv04_gart_manager;
-       else
-               man->func = &ttm_bo_manager_func;
-
+       unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
        man->use_tt = true;
        if (drm->agp.bridge) {
                man->available_caching = TTM_PL_FLAG_UNCACHED |
@@ -222,8 +207,18 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
                man->default_caching = TTM_PL_FLAG_CACHED;
        }
 
-       return ttm_bo_init_mm(&drm->ttm.bdev, TTM_PL_TT,
-                             drm->gem.gart_available >> PAGE_SHIFT);
+       if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
+               man->func = &nouveau_gart_manager;
+       else if (!drm->agp.bridge)
+               man->func = &nv04_gart_manager;
+       else
+               return ttm_range_man_init(&drm->ttm.bdev, man,
+                                         size_pages);
+
+       ttm_mem_type_manager_init(&drm->ttm.bdev, man,
+                                 size_pages);
+       ttm_mem_type_manager_set_used(man, true);
+       return 0;
 }
 
 int
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#43 lore raw

PATCH 20/59 drm/vmwgfx/ttm: convert vram mm init to new code paths

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Split out the vram thp init path vs the range manager init.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 25 +++++++++++++++++++------
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h |  4 +---
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 12 ++++++++----
 3 files changed, 28 insertions(+), 13 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +19 -6
index 1e4c2c6119c3..5a889df2de03 100644
@@ -620,6 +620,23 @@ static int vmw_dma_masks(struct vmw_private *dev_priv)
 	return ret;
 }
 
+static int vmw_vram_manager_init(struct vmw_private *dev_priv)
+{
+	int ret;
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+	ret = vmw_thp_init(dev_priv);
+#else
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
+
+	man->available_caching = TTM_PL_FLAG_CACHED;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+
+	ret = ttm_range_man_init(&dev_priv->bdev, man,
+				 dev_priv->vram_size >> PAGE_SHIFT);
+#endif
+	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	return ret;
+}
 static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 {
 	struct vmw_private *dev_priv;
@@ -866,16 +883,12 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 	 * Enable VRAM, but initially don't use it until SVGA is enabled and
 	 * unhidden.
 	 */
-	dev_priv->bdev.man[TTM_PL_VRAM].func = &vmw_thp_func;
-	dev_priv->bdev.man[TTM_PL_VRAM].available_caching = TTM_PL_FLAG_CACHED;
-	dev_priv->bdev.man[TTM_PL_VRAM].default_caching = TTM_PL_FLAG_CACHED;
-	ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_VRAM,
-			     (dev_priv->vram_size >> PAGE_SHIFT));
+
+	ret = vmw_vram_manager_init(dev_priv);
 	if (unlikely(ret != 0)) {
 		DRM_ERROR("Failed initializing memory manager for VRAM.\n");
 		goto out_no_vram;
 	}
-	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
 
 	/*
 	 * "Guest Memory Regions" is an aperture like feature with
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -3
index 65c414f119c0..10b681725a53 100644
@@ -1520,9 +1520,7 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf,
 
 /* Transparent hugepage support - vmwgfx_thp.c */
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-extern const struct ttm_mem_type_manager_func vmw_thp_func;
-#else
-#define vmw_thp_func ttm_bo_manager_func
+extern int vmw_thp_init(struct vmw_private *dev_priv);
 #endif
 
 /**
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +8 -4
index b7c816ba7166..0292c931c265 100644
@@ -115,18 +115,23 @@ static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 	}
 }
 
-static int vmw_thp_init(struct ttm_mem_type_manager *man,
-			unsigned long p_size)
+int vmw_thp_init(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
 	struct vmw_thp_manager *rman;
+	man->available_caching = TTM_PL_FLAG_CACHED;
+	man->default_caching = TTM_PL_FLAG_CACHED;
 
+	ttm_mem_type_manager_init(&dev_priv->bdev, man,
+				  dev_priv->vram_size >> PAGE_SHIFT);
 	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
 	if (!rman)
 		return -ENOMEM;
 
-	drm_mm_init(&rman->mm, 0, p_size);
+	drm_mm_init(&rman->mm, 0, man->size);
 	spin_lock_init(&rman->lock);
 	man->priv = rman;
+	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
 
@@ -158,7 +163,6 @@ static void vmw_thp_debug(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func vmw_thp_func = {
-	.init = vmw_thp_init,
 	.takedown = vmw_thp_takedown,
 	.get_node = vmw_thp_get_node,
 	.put_node = vmw_thp_put_node,
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 20/59
#44 lore raw

Re: [PATCH 20/59] drm/vmwgfx/ttm: convert vram mm init to new code paths

Quoted 23 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Split out the vram thp init path vs the range manager init.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 25 +++++++++++++++++++------
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h |  4 +---
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 12 ++++++++----
 3 files changed, 28 insertions(+), 13 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -0
index 1e4c2c6119c3..5a889df2de03 100644
@@ -620,6 +620,23 @@ static int vmw_dma_masks(struct vmw_private *dev_priv)
 	return ret;
 }
 
+static int vmw_vram_manager_init(struct vmw_private *dev_priv)
+{
+	int ret;
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static int vmw_dma_masks(struct vmw_private *dev_priv) · line 636

Quoted 10 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +10 -0
+	ret = vmw_thp_init(dev_priv);
+#else
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
+
+	man->available_caching = TTM_PL_FLAG_CACHED;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+
+	ret = ttm_range_man_init(&dev_priv->bdev, man,
+				 dev_priv->vram_size >> PAGE_SHIFT);
+#endif

The ifdeffery here looks a bit funny, but not really less convoluted than the old one I think.

Quoted 86 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +5 -6
+	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	return ret;
+}
 static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 {
 	struct vmw_private *dev_priv;
@@ -866,16 +883,12 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 	 * Enable VRAM, but initially don't use it until SVGA is enabled and
 	 * unhidden.
 	 */
-	dev_priv->bdev.man[TTM_PL_VRAM].func = &vmw_thp_func;
-	dev_priv->bdev.man[TTM_PL_VRAM].available_caching = TTM_PL_FLAG_CACHED;
-	dev_priv->bdev.man[TTM_PL_VRAM].default_caching = TTM_PL_FLAG_CACHED;
-	ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_VRAM,
-			     (dev_priv->vram_size >> PAGE_SHIFT));
+
+	ret = vmw_vram_manager_init(dev_priv);
 	if (unlikely(ret != 0)) {
 		DRM_ERROR("Failed initializing memory manager for VRAM.\n");
 		goto out_no_vram;
 	}
-	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
 
 	/*
 	 * "Guest Memory Regions" is an aperture like feature with
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -3
index 65c414f119c0..10b681725a53 100644
@@ -1520,9 +1520,7 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf,
 
 /* Transparent hugepage support - vmwgfx_thp.c */
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-extern const struct ttm_mem_type_manager_func vmw_thp_func;
-#else
-#define vmw_thp_func ttm_bo_manager_func
+extern int vmw_thp_init(struct vmw_private *dev_priv);
 #endif
 
 /**
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +8 -4
index b7c816ba7166..0292c931c265 100644
@@ -115,18 +115,23 @@ static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 	}
 }
 
-static int vmw_thp_init(struct ttm_mem_type_manager *man,
-			unsigned long p_size)
+int vmw_thp_init(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
 	struct vmw_thp_manager *rman;
+	man->available_caching = TTM_PL_FLAG_CACHED;
+	man->default_caching = TTM_PL_FLAG_CACHED;
 
+	ttm_mem_type_manager_init(&dev_priv->bdev, man,
+				  dev_priv->vram_size >> PAGE_SHIFT);
 	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
 	if (!rman)
 		return -ENOMEM;
 
-	drm_mm_init(&rman->mm, 0, p_size);
+	drm_mm_init(&rman->mm, 0, man->size);
 	spin_lock_init(&rman->lock);
 	man->priv = rman;
+	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
 
@@ -158,7 +163,6 @@ static void vmw_thp_debug(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func vmw_thp_func = {
-	.init = vmw_thp_init,
 	.takedown = vmw_thp_takedown,
 	.get_node = vmw_thp_get_node,
 	.put_node = vmw_thp_put_node,
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#45 lore raw

PATCH 21/59 drm/vmwgfx/ttm: switch gmrid allocator to new init paths.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           | 17 ++++-----------
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h           |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 21 ++++++++++++-------
 3 files changed, 19 insertions(+), 21 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -13
index 5a889df2de03..364d5f3ff9a8 100644
@@ -896,14 +896,10 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 	 *  slots as well as the bo size.
 	 */
 	dev_priv->has_gmr = true;
-	dev_priv->bdev.man[VMW_PL_GMR].func = &vmw_gmrid_manager_func;
-	dev_priv->bdev.man[VMW_PL_GMR].available_caching = TTM_PL_FLAG_CACHED;
-	dev_priv->bdev.man[VMW_PL_GMR].default_caching = TTM_PL_FLAG_CACHED;
 	/* TODO: This is most likely not correct */
-	dev_priv->bdev.man[VMW_PL_GMR].use_tt = true;
 	if (((dev_priv->capabilities & (SVGA_CAP_GMR | SVGA_CAP_GMR2)) == 0) ||
-	    refuse_dma || ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_GMR,
-					 VMW_PL_GMR) != 0) {
+	    refuse_dma ||
+	    vmw_gmrid_man_init(dev_priv, VMW_PL_GMR) != 0) {
 		DRM_INFO("No GMR memory available. "
 			 "Graphics memory resources are very limited.\n");
 		dev_priv->has_gmr = false;
@@ -911,13 +907,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 
 	if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS && !refuse_dma) {
 		dev_priv->has_mob = true;
-		dev_priv->bdev.man[VMW_PL_MOB].func = &vmw_gmrid_manager_func;
-		dev_priv->bdev.man[VMW_PL_MOB].available_caching = TTM_PL_FLAG_CACHED;
-		dev_priv->bdev.man[VMW_PL_MOB].default_caching = TTM_PL_FLAG_CACHED;
-		/* TODO: This is most likely not correct */
-		dev_priv->bdev.man[VMW_PL_MOB].use_tt = true;
-		if (ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_MOB,
-				   VMW_PL_MOB) != 0) {
+
+		if (vmw_gmrid_man_init(dev_priv, VMW_PL_MOB) != 0) {
 			DRM_INFO("No MOB memory available. "
 				 "3D will be disabled.\n");
 			dev_priv->has_mob = false;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -1
index 10b681725a53..8f319dd6cdb4 100644
@@ -1221,7 +1221,7 @@ int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv);
  * GMR Id manager
  */
 
-extern const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
+int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type);
 
 /**
  * Prime - vmwgfx_prime.c
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +14 -7
index fb1bf4dd91d1..141fb14e3583 100644
@@ -94,22 +94,28 @@ static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man,
 	}
 }
 
-static int vmw_gmrid_man_init(struct ttm_mem_type_manager *man,
-			      unsigned long p_size)
+static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
+
+int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 {
-	struct vmw_private *dev_priv =
-		container_of(man->bdev, struct vmw_private, bdev);
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
 	struct vmwgfx_gmrid_man *gman =
 		kzalloc(sizeof(*gman), GFP_KERNEL);
 
 	if (unlikely(!gman))
 		return -ENOMEM;
 
+	man->func = &vmw_gmrid_manager_func;
+	man->available_caching = TTM_PL_FLAG_CACHED;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+	/* TODO: This is most likely not correct */
+	man->use_tt = true;
+	ttm_mem_type_manager_init(&dev_priv->bdev, man, 0);
 	spin_lock_init(&gman->lock);
 	gman->used_gmr_pages = 0;
 	ida_init(&gman->gmr_ida);
 
-	switch (p_size) {
+	switch (type) {
 	case VMW_PL_GMR:
 		gman->max_gmr_ids = dev_priv->max_gmr_ids;
 		gman->max_gmr_pages = dev_priv->max_gmr_pages;
@@ -122,6 +128,8 @@ static int vmw_gmrid_man_init(struct ttm_mem_type_manager *man,
 		BUG();
 	}
 	man->priv = (void *) gman;
+
+	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
 
@@ -137,8 +145,7 @@ static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man)
 	return 0;
 }
 
-const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
-	.init = vmw_gmrid_man_init,
+static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
 	.takedown = vmw_gmrid_man_takedown,
 	.get_node = vmw_gmrid_man_get_node,
 	.put_node = vmw_gmrid_man_put_node,
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 21/59
#46 lore raw

Re: [PATCH 21/59] drm/vmwgfx/ttm: switch gmrid allocator to new init paths.

Quoted 107 lines · Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           | 17 ++++-----------
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h           |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 21 ++++++++++++-------
 3 files changed, 19 insertions(+), 21 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -13
index 5a889df2de03..364d5f3ff9a8 100644
@@ -896,14 +896,10 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 	 *  slots as well as the bo size.
 	 */
 	dev_priv->has_gmr = true;
-	dev_priv->bdev.man[VMW_PL_GMR].func = &vmw_gmrid_manager_func;
-	dev_priv->bdev.man[VMW_PL_GMR].available_caching = TTM_PL_FLAG_CACHED;
-	dev_priv->bdev.man[VMW_PL_GMR].default_caching = TTM_PL_FLAG_CACHED;
 	/* TODO: This is most likely not correct */
-	dev_priv->bdev.man[VMW_PL_GMR].use_tt = true;
 	if (((dev_priv->capabilities & (SVGA_CAP_GMR | SVGA_CAP_GMR2)) == 0) ||
-	    refuse_dma || ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_GMR,
-					 VMW_PL_GMR) != 0) {
+	    refuse_dma ||
+	    vmw_gmrid_man_init(dev_priv, VMW_PL_GMR) != 0) {
 		DRM_INFO("No GMR memory available. "
 			 "Graphics memory resources are very limited.\n");
 		dev_priv->has_gmr = false;
@@ -911,13 +907,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 
 	if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS && !refuse_dma) {
 		dev_priv->has_mob = true;
-		dev_priv->bdev.man[VMW_PL_MOB].func = &vmw_gmrid_manager_func;
-		dev_priv->bdev.man[VMW_PL_MOB].available_caching = TTM_PL_FLAG_CACHED;
-		dev_priv->bdev.man[VMW_PL_MOB].default_caching = TTM_PL_FLAG_CACHED;
-		/* TODO: This is most likely not correct */
-		dev_priv->bdev.man[VMW_PL_MOB].use_tt = true;
-		if (ttm_bo_init_mm(&dev_priv->bdev, VMW_PL_MOB,
-				   VMW_PL_MOB) != 0) {
+
+		if (vmw_gmrid_man_init(dev_priv, VMW_PL_MOB) != 0) {
 			DRM_INFO("No MOB memory available. "
 				 "3D will be disabled.\n");
 			dev_priv->has_mob = false;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -1
index 10b681725a53..8f319dd6cdb4 100644
@@ -1221,7 +1221,7 @@ int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv);
  * GMR Id manager
  */
 
-extern const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
+int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type);
 
 /**
  * Prime - vmwgfx_prime.c
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +13 -5
index fb1bf4dd91d1..141fb14e3583 100644
@@ -94,22 +94,28 @@ static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man,
 	}
 }
 
-static int vmw_gmrid_man_init(struct ttm_mem_type_manager *man,
-			      unsigned long p_size)
+static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
+
+int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 {
-	struct vmw_private *dev_priv =
-		container_of(man->bdev, struct vmw_private, bdev);
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
 	struct vmwgfx_gmrid_man *gman =
 		kzalloc(sizeof(*gman), GFP_KERNEL);
 
 	if (unlikely(!gman))
 		return -ENOMEM;
 
+	man->func = &vmw_gmrid_manager_func;
+	man->available_caching = TTM_PL_FLAG_CACHED;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+	/* TODO: This is most likely not correct */
+	man->use_tt = true;
+	ttm_mem_type_manager_init(&dev_priv->bdev, man, 0);
 	spin_lock_init(&gman->lock);
 	gman->used_gmr_pages = 0;
 	ida_init(&gman->gmr_ida);
 
-	switch (p_size) {
+	switch (type) {
 	case VMW_PL_GMR:
 		gman->max_gmr_ids = dev_priv->max_gmr_ids;
 		gman->max_gmr_pages = dev_priv->max_gmr_pages;
@@ -122,6 +128,8 @@ static int vmw_gmrid_man_init(struct ttm_mem_type_manager *man,
 		BUG();
 	}
 	man->priv = (void *) gman;
+
+	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
 

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man) · line 151

Quoted 9 lines
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1 -2
@@ -137,8 +145,7 @@ static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man)
 	return 0;
 }
 
-const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
-	.init = vmw_gmrid_man_init,
+static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
 	.takedown = vmw_gmrid_man_takedown,
 	.get_node = vmw_gmrid_man_get_node,
 	.put_node = vmw_gmrid_man_put_node,
Quoted 7 lines
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#47 lore raw

PATCH 22/59 drm/ttm: convert system manager init to new code.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Remove the exit path, since this can't fail now.

---
 drivers/gpu/drm/ttm/ttm_bo.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +17 -13
index 300bcc10696a..c56cbc6c0ba8 100644
@@ -1650,6 +1650,22 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 }
 EXPORT_SYMBOL(ttm_bo_device_release);
 
+static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
+{
+	struct ttm_mem_type_manager *man = &bdev->man[TTM_PL_SYSTEM];
+
+	/*
+	 * Initialize the system memory buffer type.
+	 * Other types need to be driver / IOCTL initialized.
+	 */
+	man->use_tt = true;
+	man->available_caching = TTM_PL_MASK_CACHING;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+
+	ttm_mem_type_manager_init(bdev, man, 0);
+	ttm_mem_type_manager_set_used(man, true);
+}
+
 int ttm_bo_device_init(struct ttm_bo_device *bdev,
 		       struct ttm_bo_driver *driver,
 		       struct address_space *mapping,
@@ -1670,16 +1686,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
 	memset(bdev->man, 0, sizeof(bdev->man));
 
-	/*
-	 * Initialize the system memory buffer type.
-	 * Other types need to be driver / IOCTL initialized.
-	 */
-	bdev->man[TTM_PL_SYSTEM].use_tt = true;
-	bdev->man[TTM_PL_SYSTEM].available_caching = TTM_PL_MASK_CACHING;
-	bdev->man[TTM_PL_SYSTEM].default_caching = TTM_PL_FLAG_CACHED;
-	ret = ttm_bo_init_mm(bdev, TTM_PL_SYSTEM, 0);
-	if (unlikely(ret != 0))
-		goto out_no_sys;
+	ttm_bo_init_sysman(bdev);
 
 	bdev->vma_manager = vma_manager;
 	INIT_DELAYED_WORK(&bdev->wq, ttm_bo_delayed_workqueue);
@@ -1691,9 +1698,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 	mutex_unlock(&ttm_global_mutex);
 
 	return 0;
-out_no_sys:
-	ttm_bo_global_release();
-	return ret;
 }
 EXPORT_SYMBOL(ttm_bo_device_init);
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 22/59
#48 lore raw

Re: [PATCH 22/59] drm/ttm: convert system manager init to new code.

Quoted 7 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Remove the exit path, since this can't fail now.

Quoted 62 lines
---
 drivers/gpu/drm/ttm/ttm_bo.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +17 -14
index 300bcc10696a..c56cbc6c0ba8 100644
@@ -1650,6 +1650,22 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 }
 EXPORT_SYMBOL(ttm_bo_device_release);
 
+static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
+{
+       struct ttm_mem_type_manager *man = &bdev->man[TTM_PL_SYSTEM];
+
+       /*
+        * Initialize the system memory buffer type.
+        * Other types need to be driver / IOCTL initialized.
+        */
+       man->use_tt = true;
+       man->available_caching = TTM_PL_MASK_CACHING;
+       man->default_caching = TTM_PL_FLAG_CACHED;
+
+       ttm_mem_type_manager_init(bdev, man, 0);
+       ttm_mem_type_manager_set_used(man, true);
+}
+
 int ttm_bo_device_init(struct ttm_bo_device *bdev,
                       struct ttm_bo_driver *driver,
                       struct address_space *mapping,
@@ -1670,16 +1686,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
        memset(bdev->man, 0, sizeof(bdev->man));
 
-       /*
-        * Initialize the system memory buffer type.
-        * Other types need to be driver / IOCTL initialized.
-        */
-       bdev->man[TTM_PL_SYSTEM].use_tt = true;
-       bdev->man[TTM_PL_SYSTEM].available_caching = TTM_PL_MASK_CACHING;
-       bdev->man[TTM_PL_SYSTEM].default_caching = TTM_PL_FLAG_CACHED;
-       ret = ttm_bo_init_mm(bdev, TTM_PL_SYSTEM, 0);
-       if (unlikely(ret != 0))
-               goto out_no_sys;
+       ttm_bo_init_sysman(bdev);
 
        bdev->vma_manager = vma_manager;
        INIT_DELAYED_WORK(&bdev->wq, ttm_bo_delayed_workqueue);
@@ -1691,9 +1698,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
        mutex_unlock(&ttm_global_mutex);
 
        return 0;
-out_no_sys:
-       ttm_bo_global_release();
-       return ret;
 }
 EXPORT_SYMBOL(ttm_bo_device_init);
 
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#49 lore raw

PATCH 23/59 drm/ttm: purge old manager init path.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/ttm/ttm_bo.c         | 19 ------------------
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 29 ++++++++++------------------
 include/drm/ttm/ttm_bo_api.h         | 18 -----------------
 include/drm/ttm/ttm_bo_driver.h      | 15 --------------
 4 files changed, 10 insertions(+), 71 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +0 -19
index c56cbc6c0ba8..da88ea6cb814 100644
@@ -1529,25 +1529,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_mem_type_manager_init);
 
-int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-			unsigned long p_size)
-{
-	int ret;
-	struct ttm_mem_type_manager *man;
-
-	BUG_ON(type >= TTM_NUM_MEM_TYPES);
-	ttm_mem_type_manager_init(bdev, &bdev->man[type], p_size);
-
-	if (type != TTM_PL_SYSTEM) {
-		ret = (*man->func->init)(man, p_size);
-		if (ret)
-			return ret;
-	}
-	ttm_mem_type_manager_set_used(man, true);
-	return 0;
-}
-EXPORT_SYMBOL(ttm_bo_init_mm);
-
 static void ttm_bo_global_kobj_release(struct kobject *kobj)
 {
 	struct ttm_bo_global *glob =
drivers/gpu/drm/ttm/ttm_bo_manager.c +10 -19
index eb86c8694f47..b56c6961b278 100644
@@ -104,11 +104,18 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
 	}
 }
 
-static int ttm_bo_man_init_private(struct ttm_mem_type_manager *man,
-				   unsigned long p_size)
+static const struct ttm_mem_type_manager_func ttm_bo_manager_func;
+
+int ttm_range_man_init(struct ttm_bo_device *bdev,
+		       struct ttm_mem_type_manager *man,
+		       unsigned long p_size)
 {
 	struct ttm_range_manager *rman;
 
+	man->func = &ttm_bo_manager_func;
+
+	ttm_mem_type_manager_init(bdev, man, p_size);
+
 	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
 	if (!rman)
 		return -ENOMEM;
@@ -116,21 +123,7 @@ static int ttm_bo_man_init_private(struct ttm_mem_type_manager *man,
 	drm_mm_init(&rman->mm, 0, p_size);
 	spin_lock_init(&rman->lock);
 	man->priv = rman;
-	return 0;
-}
 
-int ttm_range_man_init(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man,
-		       unsigned long p_size)
-{
-	int ret;
-
-	man->func = &ttm_bo_manager_func;
-
-	ttm_mem_type_manager_init(bdev, man, p_size);
-	ret = ttm_bo_man_init_private(man, p_size);
-	if (ret)
-		return ret;
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -163,11 +156,9 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
 	spin_unlock(&rman->lock);
 }
 
-const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-	.init = ttm_bo_man_init_private,
+static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
 	.takedown = ttm_bo_man_takedown,
 	.get_node = ttm_bo_man_get_node,
 	.put_node = ttm_bo_man_put_node,
 	.debug = ttm_bo_man_debug
 };
-EXPORT_SYMBOL(ttm_bo_manager_func);
include/drm/ttm/ttm_bo_api.h +0 -18
index 89053e761a69..2c84622faa44 100644
@@ -546,24 +546,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
 			       struct ttm_mem_type_manager *man,
 			       unsigned long p_size);
 
-/**
- * ttm_bo_init_mm
- *
- * @bdev: Pointer to a ttm_bo_device struct.
- * @mem_type: The memory type.
- * @p_size: size managed area in pages.
- *
- * Initialize a manager for a given memory type.
- * Note: if part of driver firstopen, it must be protected from a
- * potentially racing lastclose.
- * Returns:
- * -EINVAL: invalid size or memory type.
- * -ENOMEM: Not enough memory.
- * May also return driver-specified errors.
- */
-int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-		   unsigned long p_size);
-
 /**
  * ttm_bo_clean_mm
  *
include/drm/ttm/ttm_bo_driver.h +0 -15
index 3672dea3edca..548c27294c64 100644
@@ -48,19 +48,6 @@
 struct ttm_mem_type_manager;
 
 struct ttm_mem_type_manager_func {
-	/**
-	 * struct ttm_mem_type_manager member init
-	 *
-	 * @man: Pointer to a memory type manager.
-	 * @p_size: Implementation dependent, but typically the size of the
-	 * range to be managed in pages.
-	 *
-	 * Called to initialize a private range manager. The function is
-	 * expected to initialize the man::priv member.
-	 * Returns 0 on success, negative error code on failure.
-	 */
-	int  (*init)(struct ttm_mem_type_manager *man, unsigned long p_size);
-
 	/**
 	 * struct ttm_mem_type_manager member takedown
 	 *
@@ -822,8 +809,6 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 		       struct ttm_mem_type_manager *man,
 		       unsigned long p_size);
 
-extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
-
 /**
  * ttm_mem_type_manager_debug
  *
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 23/59
#50 lore raw

Re: [PATCH 23/59] drm/ttm: purge old manager init path.

Quoted 5 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 162 lines
---
 drivers/gpu/drm/ttm/ttm_bo.c         | 19 ------------------
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 29 ++++++++++------------------
 include/drm/ttm/ttm_bo_api.h         | 18 -----------------
 include/drm/ttm/ttm_bo_driver.h      | 15 --------------
 4 files changed, 10 insertions(+), 71 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +0 -19
index c56cbc6c0ba8..da88ea6cb814 100644
@@ -1529,25 +1529,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_mem_type_manager_init);
 
-int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-                       unsigned long p_size)
-{
-       int ret;
-       struct ttm_mem_type_manager *man;
-
-       BUG_ON(type >= TTM_NUM_MEM_TYPES);
-       ttm_mem_type_manager_init(bdev, &bdev->man[type], p_size);
-
-       if (type != TTM_PL_SYSTEM) {
-               ret = (*man->func->init)(man, p_size);
-               if (ret)
-                       return ret;
-       }
-       ttm_mem_type_manager_set_used(man, true);
-       return 0;
-}
-EXPORT_SYMBOL(ttm_bo_init_mm);
-
 static void ttm_bo_global_kobj_release(struct kobject *kobj)
 {
        struct ttm_bo_global *glob =
drivers/gpu/drm/ttm/ttm_bo_manager.c +10 -19
index eb86c8694f47..b56c6961b278 100644
@@ -104,11 +104,18 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
        }
 }
 
-static int ttm_bo_man_init_private(struct ttm_mem_type_manager *man,
-                                  unsigned long p_size)
+static const struct ttm_mem_type_manager_func ttm_bo_manager_func;
+
+int ttm_range_man_init(struct ttm_bo_device *bdev,
+                      struct ttm_mem_type_manager *man,
+                      unsigned long p_size)
 {
        struct ttm_range_manager *rman;
 
+       man->func = &ttm_bo_manager_func;
+
+       ttm_mem_type_manager_init(bdev, man, p_size);
+
        rman = kzalloc(sizeof(*rman), GFP_KERNEL);
        if (!rman)
                return -ENOMEM;
@@ -116,21 +123,7 @@ static int ttm_bo_man_init_private(struct ttm_mem_type_manager *man,
        drm_mm_init(&rman->mm, 0, p_size);
        spin_lock_init(&rman->lock);
        man->priv = rman;
-       return 0;
-}
 
-int ttm_range_man_init(struct ttm_bo_device *bdev,
-                      struct ttm_mem_type_manager *man,
-                      unsigned long p_size)
-{
-       int ret;
-
-       man->func = &ttm_bo_manager_func;
-
-       ttm_mem_type_manager_init(bdev, man, p_size);
-       ret = ttm_bo_man_init_private(man, p_size);
-       if (ret)
-               return ret;
        ttm_mem_type_manager_set_used(man, true);
        return 0;
 }
@@ -163,11 +156,9 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
        spin_unlock(&rman->lock);
 }
 
-const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-       .init = ttm_bo_man_init_private,
+static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
        .takedown = ttm_bo_man_takedown,
        .get_node = ttm_bo_man_get_node,
        .put_node = ttm_bo_man_put_node,
        .debug = ttm_bo_man_debug
 };
-EXPORT_SYMBOL(ttm_bo_manager_func);
include/drm/ttm/ttm_bo_api.h +0 -18
index 89053e761a69..2c84622faa44 100644
@@ -546,24 +546,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
                               struct ttm_mem_type_manager *man,
                               unsigned long p_size);
 
-/**
- * ttm_bo_init_mm
- *
- * @bdev: Pointer to a ttm_bo_device struct.
- * @mem_type: The memory type.
- * @p_size: size managed area in pages.
- *
- * Initialize a manager for a given memory type.
- * Note: if part of driver firstopen, it must be protected from a
- * potentially racing lastclose.
- * Returns:
- * -EINVAL: invalid size or memory type.
- * -ENOMEM: Not enough memory.
- * May also return driver-specified errors.
- */
-int ttm_bo_init_mm(struct ttm_bo_device *bdev, unsigned type,
-                  unsigned long p_size);
-
 /**
  * ttm_bo_clean_mm
  *
include/drm/ttm/ttm_bo_driver.h +0 -16
index 3672dea3edca..548c27294c64 100644
@@ -48,19 +48,6 @@
 struct ttm_mem_type_manager;
 
 struct ttm_mem_type_manager_func {
-       /**
-        * struct ttm_mem_type_manager member init
-        *
-        * @man: Pointer to a memory type manager.
-        * @p_size: Implementation dependent, but typically the size of the
-        * range to be managed in pages.
-        *
-        * Called to initialize a private range manager. The function is
-        * expected to initialize the man::priv member.
-        * Returns 0 on success, negative error code on failure.
-        */
-       int  (*init)(struct ttm_mem_type_manager *man, unsigned long p_size);
-
        /**
         * struct ttm_mem_type_manager member takedown
         *
@@ -822,8 +809,6 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
                       struct ttm_mem_type_manager *man,
                       unsigned long p_size);
 
-extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
-
 /**
  * ttm_mem_type_manager_debug
  *
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#51 lore raw

PATCH 24/59 drm/ttm: pass man around instead of mem_type in some places

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This makes it easier to cleanup things

---
 drivers/gpu/drm/ttm/ttm_bo.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +6 -8
index da88ea6cb814..af1b1c3f6ed2 100644
@@ -769,13 +769,12 @@ static int ttm_mem_evict_wait_busy(struct ttm_buffer_object *busy_bo,
 }
 
 static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
-			       uint32_t mem_type,
+			       struct ttm_mem_type_manager *man,
 			       const struct ttm_place *place,
 			       struct ttm_operation_ctx *ctx,
 			       struct ww_acquire_ctx *ticket)
 {
 	struct ttm_buffer_object *bo = NULL, *busy_bo = NULL;
-	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
 	bool locked = false;
 	unsigned i;
 	int ret;
@@ -924,7 +923,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
 			break;
 		if (unlikely(ret != -ENOSPC))
 			return ret;
-		ret = ttm_mem_evict_first(bdev, mem->mem_type, place, ctx,
+		ret = ttm_mem_evict_first(bdev, man, place, ctx,
 					  ticket);
 		if (unlikely(ret != 0))
 			return ret;
@@ -1409,14 +1408,13 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
 EXPORT_SYMBOL(ttm_bo_create);
 
 static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
-				   unsigned mem_type)
+				   struct ttm_mem_type_manager *man)
 {
 	struct ttm_operation_ctx ctx = {
 		.interruptible = false,
 		.no_wait_gpu = false,
 		.flags = TTM_OPT_FLAG_FORCE_ALLOC
 	};
-	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
 	struct ttm_bo_global *glob = &ttm_bo_glob;
 	struct dma_fence *fence;
 	int ret;
@@ -1430,7 +1428,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
 	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
 		while (!list_empty(&man->lru[i])) {
 			spin_unlock(&glob->lru_lock);
-			ret = ttm_mem_evict_first(bdev, mem_type, NULL, &ctx,
+			ret = ttm_mem_evict_first(bdev, man, NULL, &ctx,
 						  NULL);
 			if (ret)
 				return ret;
@@ -1475,7 +1473,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 
 	ret = 0;
 	if (mem_type > 0) {
-		ret = ttm_bo_force_list_clean(bdev, mem_type);
+		ret = ttm_bo_force_list_clean(bdev, man);
 		if (ret) {
 			pr_err("Cleanup eviction failed\n");
 			return ret;
@@ -1505,7 +1503,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 		return 0;
 	}
 
-	return ttm_bo_force_list_clean(bdev, mem_type);
+	return ttm_bo_force_list_clean(bdev, man);
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 24/59
#52 lore raw

Re: [PATCH 24/59] drm/ttm: pass man around instead of mem_type in some places

Quoted 7 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This makes it easier to cleanup things

Quoted 78 lines
---
 drivers/gpu/drm/ttm/ttm_bo.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +6 -9
index da88ea6cb814..af1b1c3f6ed2 100644
@@ -769,13 +769,12 @@ static int ttm_mem_evict_wait_busy(struct ttm_buffer_object *busy_bo,
 }
 
 static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
-                              uint32_t mem_type,
+                              struct ttm_mem_type_manager *man,
                               const struct ttm_place *place,
                               struct ttm_operation_ctx *ctx,
                               struct ww_acquire_ctx *ticket)
 {
        struct ttm_buffer_object *bo = NULL, *busy_bo = NULL;
-       struct ttm_mem_type_manager *man = &bdev->man[mem_type];
        bool locked = false;
        unsigned i;
        int ret;
@@ -924,7 +923,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
                        break;
                if (unlikely(ret != -ENOSPC))
                        return ret;
-               ret = ttm_mem_evict_first(bdev, mem->mem_type, place, ctx,
+               ret = ttm_mem_evict_first(bdev, man, place, ctx,
                                          ticket);
                if (unlikely(ret != 0))
                        return ret;
@@ -1409,14 +1408,13 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
 EXPORT_SYMBOL(ttm_bo_create);
 
 static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
-                                  unsigned mem_type)
+                                  struct ttm_mem_type_manager *man)
 {
        struct ttm_operation_ctx ctx = {
                .interruptible = false,
                .no_wait_gpu = false,
                .flags = TTM_OPT_FLAG_FORCE_ALLOC
        };
-       struct ttm_mem_type_manager *man = &bdev->man[mem_type];
        struct ttm_bo_global *glob = &ttm_bo_glob;
        struct dma_fence *fence;
        int ret;
@@ -1430,7 +1428,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
        for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
                while (!list_empty(&man->lru[i])) {
                        spin_unlock(&glob->lru_lock);
-                       ret = ttm_mem_evict_first(bdev, mem_type, NULL, &ctx,
+                       ret = ttm_mem_evict_first(bdev, man, NULL, &ctx,
                                                  NULL);
                        if (ret)
                                return ret;
@@ -1475,7 +1473,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 
        ret = 0;
        if (mem_type > 0) {
-               ret = ttm_bo_force_list_clean(bdev, mem_type);
+               ret = ttm_bo_force_list_clean(bdev, man);
                if (ret) {
                        pr_err("Cleanup eviction failed\n");
                        return ret;
@@ -1505,7 +1503,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
                return 0;
        }
 
-       return ttm_bo_force_list_clean(bdev, mem_type);
+       return ttm_bo_force_list_clean(bdev, man);
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);
 
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#53 lore raw

PATCH 25/59 drm/ttm: make some inline helper functions for cleanup paths. (v2)

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

The disable path is just temporary for now, it will be dropped once has_type is gone in a later patch.

v2: add docs.
rename to ttm_mem_type_manager namespace

---
 drivers/gpu/drm/ttm/ttm_bo.c    |  6 ++----
 include/drm/ttm/ttm_bo_driver.h | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -4
index af1b1c3f6ed2..127a0b62bf98 100644
@@ -1468,8 +1468,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 		return ret;
 	}
 
-	man->use_type = false;
-	man->has_type = false;
+	ttm_mem_type_manager_disable(man);
 
 	ret = 0;
 	if (mem_type > 0) {
@@ -1482,8 +1481,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 		ret = (*man->func->takedown)(man);
 	}
 
-	dma_fence_put(man->move);
-	man->move = NULL;
+	ttm_mem_type_manager_cleanup(man);
 
 	return ret;
 }
include/drm/ttm/ttm_bo_driver.h +26 -0
index 548c27294c64..41bfa514c29d 100644
@@ -680,6 +680,32 @@ static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma
 	man->use_type = used;
 }
 
+/**
+ * ttm_mem_type_manager_disable.
+ *
+ * @man: A memory manager object.
+ *
+ * Indicate the manager is not to be used and deregistered. (temporary during rework).
+ */
+static inline void ttm_mem_type_manager_disable(struct ttm_mem_type_manager *man)
+{
+	man->has_type = false;
+	man->use_type = false;
+}
+
+/**
+ * ttm_mem_type_manager_cleanup
+ *
+ * @man: A memory manager object.
+ *
+ * Cleanup the move fences from the memory manager object.
+ */
+static inline void ttm_mem_type_manager_cleanup(struct ttm_mem_type_manager *man)
+{
+	dma_fence_put(man->move);
+	man->move = NULL;
+}
+
 /*
  * ttm_bo_util.c
  */
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 25/59
#54 lore raw

Re: [PATCH 25/59] drm/ttm: make some inline helper functions for cleanup paths. (v2)

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 9 lines

From: Dave Airlie <[email protected]>

The disable path is just temporary for now, it will be dropped once has_type is gone in a later patch.

v2: add docs.
rename to ttm_mem_type_manager namespace

Quoted 56 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    |  6 ++----
  include/drm/ttm/ttm_bo_driver.h | 26 ++++++++++++++++++++++++++
  2 files changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -4
index af1b1c3f6ed2..127a0b62bf98 100644
@@ -1468,8 +1468,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  		return ret;
  	}
 
-	man->use_type = false;
-	man->has_type = false;
+	ttm_mem_type_manager_disable(man);
 
  	ret = 0;
  	if (mem_type > 0) {
@@ -1482,8 +1481,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  		ret = (*man->func->takedown)(man);
  	}
 
-	dma_fence_put(man->move);
-	man->move = NULL;
+	ttm_mem_type_manager_cleanup(man);
 
  	return ret;
  }
include/drm/ttm/ttm_bo_driver.h +19 -0
index 548c27294c64..41bfa514c29d 100644
@@ -680,6 +680,32 @@ static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma
  	man->use_type = used;
  }
 
+/**
+ * ttm_mem_type_manager_disable.
+ *
+ * @man: A memory manager object.
+ *
+ * Indicate the manager is not to be used and deregistered. (temporary during rework).
+ */
+static inline void ttm_mem_type_manager_disable(struct ttm_mem_type_manager *man)
+{
+	man->has_type = false;
+	man->use_type = false;
+}
+
+/**
+ * ttm_mem_type_manager_cleanup
+ *
+ * @man: A memory manager object.
+ *
+ * Cleanup the move fences from the memory manager object.

include/drm/ttm/ttm_bo_driver.h static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma · line 711

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7 -0
+ */
+static inline void ttm_mem_type_manager_cleanup(struct ttm_mem_type_manager *man)
+{
+	dma_fence_put(man->move);
+	man->move = NULL;
+}
+
  /*
   * ttm_bo_util.c
   */

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

Reviewed-by
#55 lore raw

Re: [PATCH 25/59] drm/ttm: make some inline helper functions for cleanup paths. (v2)

Quoted 7 lines · Christian König

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

The disable path is just temporary for now, it will be dropped once has_type is gone in a later patch.

Quoted 6 lines
Quoted 4 lines

v2: add docs.
rename to ttm_mem_type_manager namespace

Quoted 64 lines
Quoted 64 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    |  6 ++----
  include/drm/ttm/ttm_bo_driver.h | 26 ++++++++++++++++++++++++++
  2 files changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -4
index af1b1c3f6ed2..127a0b62bf98 100644
@@ -1468,8 +1468,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
              return ret;
      }
 
-     man->use_type = false;
-     man->has_type = false;
+     ttm_mem_type_manager_disable(man);
 
      ret = 0;
      if (mem_type > 0) {
@@ -1482,8 +1481,7 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
              ret = (*man->func->takedown)(man);
      }
 
-     dma_fence_put(man->move);
-     man->move = NULL;
+     ttm_mem_type_manager_cleanup(man);
 
      return ret;
  }
include/drm/ttm/ttm_bo_driver.h +26 -0
index 548c27294c64..41bfa514c29d 100644
@@ -680,6 +680,32 @@ static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma
      man->use_type = used;
  }
 
+/**
+ * ttm_mem_type_manager_disable.
+ *
+ * @man: A memory manager object.
+ *
+ * Indicate the manager is not to be used and deregistered. (temporary during rework).
+ */
+static inline void ttm_mem_type_manager_disable(struct ttm_mem_type_manager *man)
+{
+     man->has_type = false;
+     man->use_type = false;
+}
+
+/**
+ * ttm_mem_type_manager_cleanup
+ *
+ * @man: A memory manager object.
+ *
+ * Cleanup the move fences from the memory manager object.
+ */
+static inline void ttm_mem_type_manager_cleanup(struct ttm_mem_type_manager *man)
+{
+     dma_fence_put(man->move);
+     man->move = NULL;
+}
+
Quoted 8 lines

include/drm/ttm/ttm_bo_driver.h static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma · line 711

Quoted 3 lines
include/drm/ttm/ttm_bo_driver.h +0 -0
  /*
   * ttm_bo_util.c
   */

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

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

author maintainer
#56 lore raw

PATCH 26/59 drm/ttm: start allowing drivers to use new takedown path (v2)

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Allow the takedown path callback to be optional as well.

v2: use fini for range manager

---
 drivers/gpu/drm/ttm/ttm_bo.c         | 12 +++++++-----
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 21 +++++++++++++++++++--
 include/drm/ttm/ttm_bo_driver.h      | 24 ++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +7 -5
index 127a0b62bf98..a45038c74de6 100644
@@ -1407,8 +1407,8 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_bo_create);
 
-static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
-				   struct ttm_mem_type_manager *man)
+int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
+					  struct ttm_mem_type_manager *man)
 {
 	struct ttm_operation_ctx ctx = {
 		.interruptible = false,
@@ -1450,6 +1450,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
 
 	return 0;
 }
+EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
 int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 {
@@ -1472,13 +1473,14 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 
 	ret = 0;
 	if (mem_type > 0) {
-		ret = ttm_bo_force_list_clean(bdev, man);
+		ret = ttm_mem_type_manager_force_list_clean(bdev, man);
 		if (ret) {
 			pr_err("Cleanup eviction failed\n");
 			return ret;
 		}
 
-		ret = (*man->func->takedown)(man);
+		if (man->func->takedown)
+			ret = (*man->func->takedown)(man);
 	}
 
 	ttm_mem_type_manager_cleanup(man);
@@ -1501,7 +1503,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 		return 0;
 	}
 
-	return ttm_bo_force_list_clean(bdev, man);
+	return ttm_mem_type_manager_force_list_clean(bdev, man);
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);
 
drivers/gpu/drm/ttm/ttm_bo_manager.c +19 -2
index b56c6961b278..96da22be672b 100644
@@ -129,7 +129,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_range_man_init);
 
-static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
+static int ttm_bo_man_takedown_private(struct ttm_mem_type_manager *man)
 {
 	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
 	struct drm_mm *mm = &rman->mm;
@@ -146,6 +146,23 @@ static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
 	return -EBUSY;
 }
 
+int ttm_range_man_fini(struct ttm_bo_device *bdev,
+		       struct ttm_mem_type_manager *man)
+{
+	int ret;
+
+	ttm_mem_type_manager_disable(man);
+
+	ret = ttm_mem_type_manager_force_list_clean(bdev, man);
+	if (ret)
+		return ret;
+
+	ttm_bo_man_takedown_private(man);
+	ttm_mem_type_manager_cleanup(man);
+	return 0;
+}
+EXPORT_SYMBOL(ttm_range_man_fini);
+
 static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
 			     struct drm_printer *printer)
 {
@@ -157,7 +174,7 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
 }
 
 static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-	.takedown = ttm_bo_man_takedown,
+	.takedown = ttm_bo_man_takedown_private,
 	.get_node = ttm_bo_man_get_node,
 	.put_node = ttm_bo_man_put_node,
 	.debug = ttm_bo_man_debug
include/drm/ttm/ttm_bo_driver.h +24 -0
index 41bfa514c29d..9b4c22abc22c 100644
@@ -706,6 +706,18 @@ static inline void ttm_mem_type_manager_cleanup(struct ttm_mem_type_manager *man
 	man->move = NULL;
 }
 
+/*
+ * ttm_mem_type_manager_force_list_clean
+ *
+ * @bdev - device to use
+ * @man - manager to use
+ *
+ * Force all the objects out of a memory manager until clean.
+ * Part of memory manager cleanup sequence.
+ */
+int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
+					  struct ttm_mem_type_manager *man);
+
 /*
  * ttm_bo_util.c
  */
@@ -835,6 +847,17 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 		       struct ttm_mem_type_manager *man,
 		       unsigned long p_size);
 
+/**
+ * ttm_range_man_fini
+ *
+ * @bdev: ttm device
+ * @type: memory manager type
+ *
+ * Remove the generic range manager from a slot and tear it down.
+ */
+int ttm_range_man_fini(struct ttm_bo_device *bdev,
+		       struct ttm_mem_type_manager *man);
+
 /**
  * ttm_mem_type_manager_debug
  *
@@ -843,4 +866,5 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
  */
 void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
 				struct drm_printer *p);
+
 #endif
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 26/59
#57 lore raw

Re: [PATCH 26/59] drm/ttm: start allowing drivers to use new takedown path (v2)

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 6 lines

From: Dave Airlie <[email protected]>

Allow the takedown path callback to be optional as well.

v2: use fini for range manager

Quoted 143 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c         | 12 +++++++-----
  drivers/gpu/drm/ttm/ttm_bo_manager.c | 21 +++++++++++++++++++--
  include/drm/ttm/ttm_bo_driver.h      | 24 ++++++++++++++++++++++++
  3 files changed, 50 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +7 -5
index 127a0b62bf98..a45038c74de6 100644
@@ -1407,8 +1407,8 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
  }
  EXPORT_SYMBOL(ttm_bo_create);
 
-static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
-				   struct ttm_mem_type_manager *man)
+int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
+					  struct ttm_mem_type_manager *man)
  {
  	struct ttm_operation_ctx ctx = {
  		.interruptible = false,
@@ -1450,6 +1450,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
 
  	return 0;
  }
+EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
  int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  {
@@ -1472,13 +1473,14 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 
  	ret = 0;
  	if (mem_type > 0) {
-		ret = ttm_bo_force_list_clean(bdev, man);
+		ret = ttm_mem_type_manager_force_list_clean(bdev, man);
  		if (ret) {
  			pr_err("Cleanup eviction failed\n");
  			return ret;
  		}
 
-		ret = (*man->func->takedown)(man);
+		if (man->func->takedown)
+			ret = (*man->func->takedown)(man);
  	}
 
  	ttm_mem_type_manager_cleanup(man);
@@ -1501,7 +1503,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  		return 0;
  	}
 
-	return ttm_bo_force_list_clean(bdev, man);
+	return ttm_mem_type_manager_force_list_clean(bdev, man);
  }
  EXPORT_SYMBOL(ttm_bo_evict_mm);
 
drivers/gpu/drm/ttm/ttm_bo_manager.c +19 -2
index b56c6961b278..96da22be672b 100644
@@ -129,7 +129,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
  }
  EXPORT_SYMBOL(ttm_range_man_init);
 
-static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
+static int ttm_bo_man_takedown_private(struct ttm_mem_type_manager *man)
  {
  	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
  	struct drm_mm *mm = &rman->mm;
@@ -146,6 +146,23 @@ static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
  	return -EBUSY;
  }
 
+int ttm_range_man_fini(struct ttm_bo_device *bdev,
+		       struct ttm_mem_type_manager *man)
+{
+	int ret;
+
+	ttm_mem_type_manager_disable(man);
+
+	ret = ttm_mem_type_manager_force_list_clean(bdev, man);
+	if (ret)
+		return ret;
+
+	ttm_bo_man_takedown_private(man);
+	ttm_mem_type_manager_cleanup(man);
+	return 0;
+}
+EXPORT_SYMBOL(ttm_range_man_fini);
+
  static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
  			     struct drm_printer *printer)
  {
@@ -157,7 +174,7 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
  }
 
  static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-	.takedown = ttm_bo_man_takedown,
+	.takedown = ttm_bo_man_takedown_private,
  	.get_node = ttm_bo_man_get_node,
  	.put_node = ttm_bo_man_put_node,
  	.debug = ttm_bo_man_debug
include/drm/ttm/ttm_bo_driver.h +23 -0
index 41bfa514c29d..9b4c22abc22c 100644
@@ -706,6 +706,18 @@ static inline void ttm_mem_type_manager_cleanup(struct ttm_mem_type_manager *man
  	man->move = NULL;
  }
 
+/*
+ * ttm_mem_type_manager_force_list_clean
+ *
+ * @bdev - device to use
+ * @man - manager to use
+ *
+ * Force all the objects out of a memory manager until clean.
+ * Part of memory manager cleanup sequence.
+ */
+int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
+					  struct ttm_mem_type_manager *man);
+
  /*
   * ttm_bo_util.c
   */
@@ -835,6 +847,17 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
  		       struct ttm_mem_type_manager *man,
  		       unsigned long p_size);
 
+/**
+ * ttm_range_man_fini
+ *
+ * @bdev: ttm device
+ * @type: memory manager type
+ *
+ * Remove the generic range manager from a slot and tear it down.
+ */
+int ttm_range_man_fini(struct ttm_bo_device *bdev,
+		       struct ttm_mem_type_manager *man);
+
  /**
   * ttm_mem_type_manager_debug
   *

include/drm/ttm/ttm_bo_driver.h int ttm_range_man_init(struct ttm_bo_device *bdev, · line 870

Quoted 5 lines
include/drm/ttm/ttm_bo_driver.h +1 -0
@@ -843,4 +866,5 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
   */
  void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
  				struct drm_printer *p);
+
  #endif

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

Reviewed-by
#58 lore raw

Re: [PATCH 26/59] drm/ttm: start allowing drivers to use new takedown path (v2)

Quoted 10 lines · Christian König

Am 04.08.20 um 04:55 schrieb Dave Airlie:

Quoted 6 lines

From: Dave Airlie <[email protected]>

Allow the takedown path callback to be optional as well.

v2: use fini for range manager

Quoted 146 lines
Quoted 146 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c         | 12 +++++++-----
  drivers/gpu/drm/ttm/ttm_bo_manager.c | 21 +++++++++++++++++++--
  include/drm/ttm/ttm_bo_driver.h      | 24 ++++++++++++++++++++++++
  3 files changed, 50 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +7 -5
index 127a0b62bf98..a45038c74de6 100644
@@ -1407,8 +1407,8 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
  }
  EXPORT_SYMBOL(ttm_bo_create);
 
-static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
-                                struct ttm_mem_type_manager *man)
+int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
+                                       struct ttm_mem_type_manager *man)
  {
      struct ttm_operation_ctx ctx = {
              .interruptible = false,
@@ -1450,6 +1450,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
 
      return 0;
  }
+EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
  int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  {
@@ -1472,13 +1473,14 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 
      ret = 0;
      if (mem_type > 0) {
-             ret = ttm_bo_force_list_clean(bdev, man);
+             ret = ttm_mem_type_manager_force_list_clean(bdev, man);
              if (ret) {
                      pr_err("Cleanup eviction failed\n");
                      return ret;
              }
 
-             ret = (*man->func->takedown)(man);
+             if (man->func->takedown)
+                     ret = (*man->func->takedown)(man);
      }
 
      ttm_mem_type_manager_cleanup(man);
@@ -1501,7 +1503,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
              return 0;
      }
 
-     return ttm_bo_force_list_clean(bdev, man);
+     return ttm_mem_type_manager_force_list_clean(bdev, man);
  }
  EXPORT_SYMBOL(ttm_bo_evict_mm);
 
drivers/gpu/drm/ttm/ttm_bo_manager.c +19 -2
index b56c6961b278..96da22be672b 100644
@@ -129,7 +129,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
  }
  EXPORT_SYMBOL(ttm_range_man_init);
 
-static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
+static int ttm_bo_man_takedown_private(struct ttm_mem_type_manager *man)
  {
      struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
      struct drm_mm *mm = &rman->mm;
@@ -146,6 +146,23 @@ static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
      return -EBUSY;
  }
 
+int ttm_range_man_fini(struct ttm_bo_device *bdev,
+                    struct ttm_mem_type_manager *man)
+{
+     int ret;
+
+     ttm_mem_type_manager_disable(man);
+
+     ret = ttm_mem_type_manager_force_list_clean(bdev, man);
+     if (ret)
+             return ret;
+
+     ttm_bo_man_takedown_private(man);
+     ttm_mem_type_manager_cleanup(man);
+     return 0;
+}
+EXPORT_SYMBOL(ttm_range_man_fini);
+
  static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
                           struct drm_printer *printer)
  {
@@ -157,7 +174,7 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
  }
 
  static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-     .takedown = ttm_bo_man_takedown,
+     .takedown = ttm_bo_man_takedown_private,
      .get_node = ttm_bo_man_get_node,
      .put_node = ttm_bo_man_put_node,
      .debug = ttm_bo_man_debug
include/drm/ttm/ttm_bo_driver.h +23 -0
index 41bfa514c29d..9b4c22abc22c 100644
@@ -706,6 +706,18 @@ static inline void ttm_mem_type_manager_cleanup(struct ttm_mem_type_manager *man
      man->move = NULL;
  }
 
+/*
+ * ttm_mem_type_manager_force_list_clean
+ *
+ * @bdev - device to use
+ * @man - manager to use
+ *
+ * Force all the objects out of a memory manager until clean.
+ * Part of memory manager cleanup sequence.
+ */
+int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
+                                       struct ttm_mem_type_manager *man);
+
  /*
   * ttm_bo_util.c
   */
@@ -835,6 +847,17 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
                     struct ttm_mem_type_manager *man,
                     unsigned long p_size);
 
+/**
+ * ttm_range_man_fini
+ *
+ * @bdev: ttm device
+ * @type: memory manager type
+ *
+ * Remove the generic range manager from a slot and tear it down.
+ */
+int ttm_range_man_fini(struct ttm_bo_device *bdev,
+                    struct ttm_mem_type_manager *man);
+
  /**
   * ttm_mem_type_manager_debug
   *
@@ -843,4 +866,5 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
   */
  void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
Quoted 8 lines

include/drm/ttm/ttm_bo_driver.h int ttm_range_man_init(struct ttm_bo_device *bdev, · line 870

Quoted 3 lines
include/drm/ttm/ttm_bo_driver.h +1 -0
                              struct drm_printer *p);
+
  #endif

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

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

author maintainer
#59 lore raw

PATCH 27/59 drm/amdgpu/ttm: use new takedown path

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 15 +++++++++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c      | 10 +++++-----
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h      |  2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 15 +++++++++++----
 4 files changed, 29 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +11 -4
index 9d05e1ab2048..28056d12b199 100644
@@ -133,10 +133,18 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
  * Destroy and free the GTT manager, returns -EBUSY if ranges are still
  * allocated inside it.
  */
-static int amdgpu_gtt_mgr_fini(struct ttm_mem_type_manager *man)
+void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
 	struct amdgpu_gtt_mgr *mgr = man->priv;
+	int ret;
+
+	ttm_mem_type_manager_disable(man);
+
+	ret = ttm_mem_type_manager_force_list_clean(&adev->mman.bdev, man);
+	if (ret)
+		return;
+
 	spin_lock(&mgr->lock);
 	drm_mm_takedown(&mgr->mm);
 	spin_unlock(&mgr->lock);
@@ -146,7 +154,7 @@ static int amdgpu_gtt_mgr_fini(struct ttm_mem_type_manager *man)
 	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);
 	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);
 
-	return 0;
+	ttm_mem_type_manager_cleanup(man);
 }
 
 /**
@@ -307,7 +315,6 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
 }
 
 static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
-	.takedown = amdgpu_gtt_mgr_fini,
 	.get_node = amdgpu_gtt_mgr_new,
 	.put_node = amdgpu_gtt_mgr_del,
 	.debug = amdgpu_gtt_mgr_debug
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -5
index 4a09a625e748..d7516144bb0a 100644
@@ -2012,11 +2012,11 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 		iounmap(adev->mman.aper_base_kaddr);
 	adev->mman.aper_base_kaddr = NULL;
 
-	ttm_bo_clean_mm(&adev->mman.bdev, TTM_PL_VRAM);
-	ttm_bo_clean_mm(&adev->mman.bdev, TTM_PL_TT);
-	ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_GDS);
-	ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_GWS);
-	ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_OA);
+	amdgpu_vram_mgr_fini(adev);
+	amdgpu_gtt_mgr_fini(adev);
+	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_GDS]);
+	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_GWS]);
+	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_OA]);
 	ttm_bo_device_release(&adev->mman.bdev);
 	adev->mman.initialized = false;
 	DRM_INFO("amdgpu: ttm finalized\n");
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +2 -0
index fb45c0a323b0..c01fdb3f0458 100644
@@ -68,7 +68,9 @@ struct amdgpu_copy_mem {
 };
 
 int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size);
+void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev);
 int amdgpu_vram_mgr_init(struct amdgpu_device *adev);
+void amdgpu_vram_mgr_fini(struct amdgpu_device *adev);
 
 bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem);
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +11 -4
index bef3497de2ae..c3bc9ddd437e 100644
@@ -205,10 +205,17 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
  * Destroy and free the VRAM manager, returns -EBUSY if ranges are still
  * allocated inside it.
  */
-static int amdgpu_vram_mgr_fini(struct ttm_mem_type_manager *man)
+void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
 	struct amdgpu_vram_mgr *mgr = man->priv;
+	int ret;
+
+	ttm_mem_type_manager_disable(man);
+
+	ret = ttm_mem_type_manager_force_list_clean(&adev->mman.bdev, man);
+	if (ret)
+		return;
 
 	spin_lock(&mgr->lock);
 	drm_mm_takedown(&mgr->mm);
@@ -216,7 +223,8 @@ static int amdgpu_vram_mgr_fini(struct ttm_mem_type_manager *man)
 	kfree(mgr);
 	man->priv = NULL;
 	sysfs_remove_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
-	return 0;
+
+	ttm_mem_type_manager_cleanup(man);
 }
 
 /**
@@ -596,7 +604,6 @@ static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
 }
 
 static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
-	.takedown	= amdgpu_vram_mgr_fini,
 	.get_node	= amdgpu_vram_mgr_new,
 	.put_node	= amdgpu_vram_mgr_del,
 	.debug		= amdgpu_vram_mgr_debug
Signature · 6 lines
2.26.2

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

PATCH 28/59 drm/vmwgfx: takedown vram manager

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Don't bother returning EBUSY, nobody cares enough, if the driver has a problem, it should deal with it.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 14 +++++++++++++-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 23 +++++++++++++----------
 3 files changed, 27 insertions(+), 11 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +13 -1
index 364d5f3ff9a8..4f4d22bac477 100644
@@ -637,6 +637,17 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
 	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
 	return ret;
 }
+
+static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
+{
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+	vmw_thp_fini(dev_priv);
+#else
+	ttm_bo_man_fini(&dev_priv->bdev,
+			    &dev_priv->bdev.man[TTM_PL_VRAM]);
+#endif
+}
+
 static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 {
 	struct vmw_private *dev_priv;
@@ -988,7 +999,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
 	if (dev_priv->has_gmr)
 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
-	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);
+	vmw_vram_manager_fini(dev_priv);
 out_no_vram:
 	(void)ttm_bo_device_release(&dev_priv->bdev);
 out_no_bdev:
@@ -1042,6 +1053,7 @@ static void vmw_driver_unload(struct drm_device *dev)
 	vmw_release_device_early(dev_priv);
 	if (dev_priv->has_mob)
 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+	vmw_vram_manager_fini(dev_priv);
 	(void) ttm_bo_device_release(&dev_priv->bdev);
 	drm_vma_offset_manager_destroy(&dev_priv->vma_manager);
 	vmw_release_device_late(dev_priv);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -0
index 8f319dd6cdb4..c6530d7b6d51 100644
@@ -1521,6 +1521,7 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf,
 /* Transparent hugepage support - vmwgfx_thp.c */
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 extern int vmw_thp_init(struct vmw_private *dev_priv);
+void vmw_thp_fini(struct vmw_private *dev_priv);
 #endif
 
 /**
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +13 -10
index 0292c931c265..548f152b9963 100644
@@ -135,21 +135,25 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 	return 0;
 }
 
-static int vmw_thp_takedown(struct ttm_mem_type_manager *man)
+void vmw_thp_fini(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
 	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
 	struct drm_mm *mm = &rman->mm;
+	int ret;
+
+	ttm_mem_type_manager_disable(man);
 
+	ret = ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
+	if (ret)
+		return;
 	spin_lock(&rman->lock);
-	if (drm_mm_clean(mm)) {
-		drm_mm_takedown(mm);
-		spin_unlock(&rman->lock);
-		kfree(rman);
-		man->priv = NULL;
-		return 0;
-	}
+	drm_mm_clean(mm);
+	drm_mm_takedown(mm);
 	spin_unlock(&rman->lock);
-	return -EBUSY;
+	kfree(rman);
+	man->priv = NULL;
+	ttm_mem_type_manager_cleanup(man);
 }
 
 static void vmw_thp_debug(struct ttm_mem_type_manager *man,
@@ -163,7 +167,6 @@ static void vmw_thp_debug(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func vmw_thp_func = {
-	.takedown = vmw_thp_takedown,
 	.get_node = vmw_thp_get_node,
 	.put_node = vmw_thp_put_node,
 	.debug = vmw_thp_debug
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 28/59
#61 lore raw

Re: [PATCH 28/59] drm/vmwgfx: takedown vram manager

Quoted 44 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Don't bother returning EBUSY, nobody cares enough, if the driver has a problem, it should deal with it.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 14 +++++++++++++-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 23 +++++++++++++----------
 3 files changed, 27 insertions(+), 11 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +12 -1
index 364d5f3ff9a8..4f4d22bac477 100644
@@ -637,6 +637,17 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
 	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
 	return ret;
 }
+
+static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
+{
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+	vmw_thp_fini(dev_priv);
+#else
+	ttm_bo_man_fini(&dev_priv->bdev,
+			    &dev_priv->bdev.man[TTM_PL_VRAM]);
+#endif
+}
+
 static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 {
 	struct vmw_private *dev_priv;
@@ -988,7 +999,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
 	if (dev_priv->has_gmr)
 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
-	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);
+	vmw_vram_manager_fini(dev_priv);
 out_no_vram:
 	(void)ttm_bo_device_release(&dev_priv->bdev);
 out_no_bdev:

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c static void vmw_driver_unload(struct drm_device *dev) · line 1056

Quoted 4 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 -0
@@ -1042,6 +1053,7 @@ static void vmw_driver_unload(struct drm_device *dev)
 	vmw_release_device_early(dev_priv);
 	if (dev_priv->has_mob)
 		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+	vmw_vram_manager_fini(dev_priv);

I think drmm_ would be neat for all this stuff eventually, but we're still in the very early phases of rolling that out.

Quoted 55 lines
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +0 -0
 	(void) ttm_bo_device_release(&dev_priv->bdev);
 	drm_vma_offset_manager_destroy(&dev_priv->vma_manager);
 	vmw_release_device_late(dev_priv);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -0
index 8f319dd6cdb4..c6530d7b6d51 100644
@@ -1521,6 +1521,7 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf,
 /* Transparent hugepage support - vmwgfx_thp.c */
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 extern int vmw_thp_init(struct vmw_private *dev_priv);
+void vmw_thp_fini(struct vmw_private *dev_priv);
 #endif
 
 /**
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +13 -9
index 0292c931c265..548f152b9963 100644
@@ -135,21 +135,25 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 	return 0;
 }
 
-static int vmw_thp_takedown(struct ttm_mem_type_manager *man)
+void vmw_thp_fini(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
 	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
 	struct drm_mm *mm = &rman->mm;
+	int ret;
+
+	ttm_mem_type_manager_disable(man);
 
+	ret = ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
+	if (ret)
+		return;
 	spin_lock(&rman->lock);
-	if (drm_mm_clean(mm)) {
-		drm_mm_takedown(mm);
-		spin_unlock(&rman->lock);
-		kfree(rman);
-		man->priv = NULL;
-		return 0;
-	}
+	drm_mm_clean(mm);
+	drm_mm_takedown(mm);
 	spin_unlock(&rman->lock);
-	return -EBUSY;
+	kfree(rman);
+	man->priv = NULL;
+	ttm_mem_type_manager_cleanup(man);
 }
 
 static void vmw_thp_debug(struct ttm_mem_type_manager *man,

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c static void vmw_thp_debug(struct ttm_mem_type_manager *man, · line 172

Quoted 7 lines
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +0 -1
@@ -163,7 +167,6 @@ static void vmw_thp_debug(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func vmw_thp_func = {
-	.takedown = vmw_thp_takedown,
 	.get_node = vmw_thp_get_node,
 	.put_node = vmw_thp_put_node,
 	.debug = vmw_thp_debug

Still the mildly icky #ifdef, but looks good to me.

Quoted 7 lines
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#62 lore raw

PATCH 29/59 drm/vram_helper: call explicit mm takedown

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/drm_gem_vram_helper.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_gem_vram_helper.c +1 -0
index d7c0fdf82eb6..2099851c017e 100644
@@ -1127,6 +1127,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
 static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)
 {
+	ttm_range_man_fini(&vmm->bdev, &vmm->bdev.man[TTM_PL_VRAM]);
 	ttm_bo_device_release(&vmm->bdev);
 }
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 29/59
#63 lore raw

Re: [PATCH 29/59] drm/vram_helper: call explicit mm takedown

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 3 lines

From: Dave Airlie <[email protected]>

Quoted 17 lines
---
 drivers/gpu/drm/drm_gem_vram_helper.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_gem_vram_helper.c +1 -0
index d7c0fdf82eb6..2099851c017e 100644
@@ -1127,6 +1127,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
 static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)
 {
+	ttm_range_man_fini(&vmm->bdev, &vmm->bdev.man[TTM_PL_VRAM]);
 	ttm_bo_device_release(&vmm->bdev);
 }
 
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

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

author maintainer
#64 lore raw

PATCH 30/59 drm/nouveau: use new cleanup paths

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 41 ++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 11 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +30 -11
index cfcbecd332ef..bb310719e3f5 100644
@@ -31,12 +31,6 @@
 
 #include <core/tegra.h>
 
-static int
-nouveau_manager_fini(struct ttm_mem_type_manager *man)
-{
-	return 0;
-}
-
 static void
 nouveau_manager_del(struct ttm_mem_type_manager *man, struct ttm_mem_reg *reg)
 {
@@ -70,7 +64,6 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
-	.takedown = nouveau_manager_fini,
 	.get_node = nouveau_vram_manager_new,
 	.put_node = nouveau_manager_del,
 };
@@ -94,7 +87,6 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
-	.takedown = nouveau_manager_fini,
 	.get_node = nouveau_gart_manager_new,
 	.put_node = nouveau_manager_del,
 };
@@ -127,7 +119,6 @@ nv04_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nv04_gart_manager = {
-	.takedown = nouveau_manager_fini,
 	.get_node = nv04_gart_manager_new,
 	.put_node = nouveau_manager_del,
 };
@@ -192,6 +183,19 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 	}
 }
 
+static void
+nouveau_ttm_fini_vram(struct nouveau_drm *drm)
+{
+	struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_VRAM];
+
+	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
+		ttm_mem_type_manager_disable(man);
+		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
+		ttm_mem_type_manager_cleanup(man);
+	} else
+		ttm_range_man_fini(&drm->ttm.bdev, man);
+}
+
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
@@ -221,6 +225,21 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 	return 0;
 }
 
+static void
+nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
+{
+	struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
+
+	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
+	    drm->agp.bridge)
+		ttm_range_man_fini(&drm->ttm.bdev, man);
+	else {
+		ttm_mem_type_manager_disable(man);
+		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
+		ttm_mem_type_manager_cleanup(man);
+	}
+}
+
 int
 nouveau_ttm_init(struct nouveau_drm *drm)
 {
@@ -310,8 +329,8 @@ nouveau_ttm_fini(struct nouveau_drm *drm)
 {
 	struct nvkm_device *device = nvxx_device(&drm->client.device);
 
-	ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_VRAM);
-	ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_TT);
+	nouveau_ttm_fini_vram(drm);
+	nouveau_ttm_fini_gtt(drm);
 
 	ttm_bo_device_release(&drm->ttm.bdev);
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 30/59
#65 lore raw

Re: [PATCH 30/59] drm/nouveau: use new cleanup paths

Quoted 4 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 101 lines
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 41 ++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 11 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +30 -12
index cfcbecd332ef..bb310719e3f5 100644
@@ -31,12 +31,6 @@
 
 #include <core/tegra.h>
 
-static int
-nouveau_manager_fini(struct ttm_mem_type_manager *man)
-{
-       return 0;
-}
-
 static void
 nouveau_manager_del(struct ttm_mem_type_manager *man, struct ttm_mem_reg *reg)
 {
@@ -70,7 +64,6 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
-       .takedown = nouveau_manager_fini,
        .get_node = nouveau_vram_manager_new,
        .put_node = nouveau_manager_del,
 };
@@ -94,7 +87,6 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
-       .takedown = nouveau_manager_fini,
        .get_node = nouveau_gart_manager_new,
        .put_node = nouveau_manager_del,
 };
@@ -127,7 +119,6 @@ nv04_gart_manager_new(struct ttm_mem_type_manager *man,
 }
 
 const struct ttm_mem_type_manager_func nv04_gart_manager = {
-       .takedown = nouveau_manager_fini,
        .get_node = nv04_gart_manager_new,
        .put_node = nouveau_manager_del,
 };
@@ -192,6 +183,19 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
        }
 }
 
+static void
+nouveau_ttm_fini_vram(struct nouveau_drm *drm)
+{
+       struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_VRAM];
+
+       if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
+               ttm_mem_type_manager_disable(man);
+               ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
+               ttm_mem_type_manager_cleanup(man);
+       } else
+               ttm_range_man_fini(&drm->ttm.bdev, man);
+}
+
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
@@ -221,6 +225,21 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
        return 0;
 }
 
+static void
+nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
+{
+       struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
+
+       if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
+           drm->agp.bridge)
+               ttm_range_man_fini(&drm->ttm.bdev, man);
+       else {
+               ttm_mem_type_manager_disable(man);
+               ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
+               ttm_mem_type_manager_cleanup(man);
+       }
+}
+
 int
 nouveau_ttm_init(struct nouveau_drm *drm)
 {
@@ -310,8 +329,8 @@ nouveau_ttm_fini(struct nouveau_drm *drm)
 {
        struct nvkm_device *device = nvxx_device(&drm->client.device);
 
-       ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_VRAM);
-       ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_TT);
+       nouveau_ttm_fini_vram(drm);
+       nouveau_ttm_fini_gtt(drm);
 
        ttm_bo_device_release(&drm->ttm.bdev);
 
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#66 lore raw

PATCH 31/59 drm/radeon/ttm: use new takedown paths

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +2 -2
index 84c02b4529c0..76b409af9476 100644
@@ -825,8 +825,8 @@ void radeon_ttm_fini(struct radeon_device *rdev)
 		}
 		radeon_bo_unref(&rdev->stolen_vga_memory);
 	}
-	ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_VRAM);
-	ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_TT);
+	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_VRAM]);
+	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_TT]);
 	ttm_bo_device_release(&rdev->mman.bdev);
 	radeon_gart_fini(rdev);
 	rdev->mman.initialized = false;
Signature · 6 lines
2.26.2

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

PATCH 32/59 drm/qxl/ttm: use new takedown path

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/qxl/qxl_ttm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +2 -2
index bfbd2c5c38a2..0f7071829056 100644
@@ -266,8 +266,8 @@ int qxl_ttm_init(struct qxl_device *qdev)
 
 void qxl_ttm_fini(struct qxl_device *qdev)
 {
-	ttm_bo_clean_mm(&qdev->mman.bdev, TTM_PL_VRAM);
-	ttm_bo_clean_mm(&qdev->mman.bdev, TTM_PL_PRIV);
+	ttm_range_man_fini(&qdev->mman.bdev, &qdev->mman.bdev.man[TTM_PL_VRAM]);
+	ttm_range_man_fini(&qdev->mman.bdev, &qdev->mman.bdev.man[TTM_PL_PRIV]);
 	ttm_bo_device_release(&qdev->mman.bdev);
 	DRM_INFO("qxl: ttm finalized\n");
 }
Signature · 6 lines
2.26.2

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

PATCH 33/59 drm/vmwgfx: fix gmrid takedown paths to new interface

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           |  9 ++++-----
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h           |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 11 ++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -5
index 4f4d22bac477..f368a9cc0c2a 100644
@@ -996,9 +996,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 	vmw_kms_close(dev_priv);
 out_no_kms:
 	if (dev_priv->has_mob)
-		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_MOB);
 	if (dev_priv->has_gmr)
-		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_GMR);
 	vmw_vram_manager_fini(dev_priv);
 out_no_vram:
 	(void)ttm_bo_device_release(&dev_priv->bdev);
@@ -1047,12 +1047,11 @@ static void vmw_driver_unload(struct drm_device *dev)
 	vmw_overlay_close(dev_priv);
 
 	if (dev_priv->has_gmr)
-		(void)ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
-	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_GMR);
 
 	vmw_release_device_early(dev_priv);
 	if (dev_priv->has_mob)
-		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_MOB);
 	vmw_vram_manager_fini(dev_priv);
 	(void) ttm_bo_device_release(&dev_priv->bdev);
 	drm_vma_offset_manager_destroy(&dev_priv->vma_manager);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -0
index c6530d7b6d51..aa763c6b1146 100644
@@ -1222,6 +1222,7 @@ int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv);
  */
 
 int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type);
+void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type);
 
 /**
  * Prime - vmwgfx_prime.c
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +8 -3
index 141fb14e3583..ec1b5bb01a93 100644
@@ -133,20 +133,25 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 	return 0;
 }
 
-static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man)
+void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)
 {
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
 	struct vmwgfx_gmrid_man *gman =
 		(struct vmwgfx_gmrid_man *)man->priv;
 
+	ttm_mem_type_manager_disable(man);
+
+	ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
+
 	if (gman) {
 		ida_destroy(&gman->gmr_ida);
 		kfree(gman);
 	}
-	return 0;
+
+	ttm_mem_type_manager_cleanup(man);
 }
 
 static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
-	.takedown = vmw_gmrid_man_takedown,
 	.get_node = vmw_gmrid_man_get_node,
 	.put_node = vmw_gmrid_man_put_node,
 };
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 33/59
#70 lore raw

Re: [PATCH 33/59] drm/vmwgfx: fix gmrid takedown paths to new interface

Quoted 62 lines · Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           |  9 ++++-----
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h           |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 11 ++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -5
index 4f4d22bac477..f368a9cc0c2a 100644
@@ -996,9 +996,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 	vmw_kms_close(dev_priv);
 out_no_kms:
 	if (dev_priv->has_mob)
-		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_MOB);
 	if (dev_priv->has_gmr)
-		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_GMR);
 	vmw_vram_manager_fini(dev_priv);
 out_no_vram:
 	(void)ttm_bo_device_release(&dev_priv->bdev);
@@ -1047,12 +1047,11 @@ static void vmw_driver_unload(struct drm_device *dev)
 	vmw_overlay_close(dev_priv);
 
 	if (dev_priv->has_gmr)
-		(void)ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_GMR);
-	(void)ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_VRAM);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_GMR);
 
 	vmw_release_device_early(dev_priv);
 	if (dev_priv->has_mob)
-		(void) ttm_bo_clean_mm(&dev_priv->bdev, VMW_PL_MOB);
+		vmw_gmrid_man_fini(dev_priv, VMW_PL_MOB);
 	vmw_vram_manager_fini(dev_priv);
 	(void) ttm_bo_device_release(&dev_priv->bdev);
 	drm_vma_offset_manager_destroy(&dev_priv->vma_manager);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +1 -0
index c6530d7b6d51..aa763c6b1146 100644
@@ -1222,6 +1222,7 @@ int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv);
  */
 
 int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type);
+void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type);
 
 /**
  * Prime - vmwgfx_prime.c
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1 -1
index 141fb14e3583..ec1b5bb01a93 100644
@@ -133,20 +133,25 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 	return 0;
 }
 
-static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man)
+void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type) · line 146

Quoted 10 lines
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +5 -0
 {
+	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
 	struct vmwgfx_gmrid_man *gman =
 		(struct vmwgfx_gmrid_man *)man->priv;
 
+	ttm_mem_type_manager_disable(man);
+
+	ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
+
 	if (gman) {

I don't think this can ever be non-NULL if init worked, not after the demidlayering. Maybe put a WARN_ON(!gman) in here. With that:

Quoted 20 lines
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +2 -2
 		ida_destroy(&gman->gmr_ida);
 		kfree(gman);
 	}
-	return 0;
+
+	ttm_mem_type_manager_cleanup(man);
 }
 
 static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
-	.takedown = vmw_gmrid_man_takedown,
 	.get_node = vmw_gmrid_man_get_node,
 	.put_node = vmw_gmrid_man_put_node,
 };
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#71 lore raw

PATCH 34/59 drm/ttm: remove range manager legacy takedown path

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Now all drivers have been converted, drop the non-driver path.

---
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_manager.c +9 -19
index 96da22be672b..86bf5e71e959 100644
@@ -129,26 +129,11 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_range_man_init);
 
-static int ttm_bo_man_takedown_private(struct ttm_mem_type_manager *man)
-{
-	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
-	struct drm_mm *mm = &rman->mm;
-
-	spin_lock(&rman->lock);
-	if (drm_mm_clean(mm)) {
-		drm_mm_takedown(mm);
-		spin_unlock(&rman->lock);
-		kfree(rman);
-		man->priv = NULL;
-		return 0;
-	}
-	spin_unlock(&rman->lock);
-	return -EBUSY;
-}
-
 int ttm_range_man_fini(struct ttm_bo_device *bdev,
 		       struct ttm_mem_type_manager *man)
 {
+	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+	struct drm_mm *mm = &rman->mm;
 	int ret;
 
 	ttm_mem_type_manager_disable(man);
@@ -157,7 +142,13 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
 	if (ret)
 		return ret;
 
-	ttm_bo_man_takedown_private(man);
+	spin_lock(&rman->lock);
+	drm_mm_clean(mm);
+	drm_mm_takedown(mm);
+	spin_unlock(&rman->lock);
+	kfree(rman);
+	man->priv = NULL;
+
 	ttm_mem_type_manager_cleanup(man);
 	return 0;
 }
@@ -174,7 +165,6 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
 }
 
 static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-	.takedown = ttm_bo_man_takedown_private,
 	.get_node = ttm_bo_man_get_node,
 	.put_node = ttm_bo_man_put_node,
 	.debug = ttm_bo_man_debug
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 34/59
#72 lore raw

Re: [PATCH 34/59] drm/ttm: remove range manager legacy takedown path

Quoted 7 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Now all drivers have been converted, drop the non-driver path.

Quoted 63 lines
---
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_manager.c +9 -20
index 96da22be672b..86bf5e71e959 100644
@@ -129,26 +129,11 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_range_man_init);
 
-static int ttm_bo_man_takedown_private(struct ttm_mem_type_manager *man)
-{
-       struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
-       struct drm_mm *mm = &rman->mm;
-
-       spin_lock(&rman->lock);
-       if (drm_mm_clean(mm)) {
-               drm_mm_takedown(mm);
-               spin_unlock(&rman->lock);
-               kfree(rman);
-               man->priv = NULL;
-               return 0;
-       }
-       spin_unlock(&rman->lock);
-       return -EBUSY;
-}
-
 int ttm_range_man_fini(struct ttm_bo_device *bdev,
                       struct ttm_mem_type_manager *man)
 {
+       struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+       struct drm_mm *mm = &rman->mm;
        int ret;
 
        ttm_mem_type_manager_disable(man);
@@ -157,7 +142,13 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
        if (ret)
                return ret;
 
-       ttm_bo_man_takedown_private(man);
+       spin_lock(&rman->lock);
+       drm_mm_clean(mm);
+       drm_mm_takedown(mm);
+       spin_unlock(&rman->lock);
+       kfree(rman);
+       man->priv = NULL;
+
        ttm_mem_type_manager_cleanup(man);
        return 0;
 }
@@ -174,7 +165,6 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
 }
 
 static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-       .takedown = ttm_bo_man_takedown_private,
        .get_node = ttm_bo_man_get_node,
        .put_node = ttm_bo_man_put_node,
        .debug = ttm_bo_man_debug
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#73 lore raw

PATCH 35/59 drm/ttm: make TTM responsible for cleaning system only.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Drivers should all be cleaning up their memory managers themselves now, so let the core just clean the system one up.

Remove the legacy cleaning interface.

---
 drivers/gpu/drm/ttm/ttm_bo.c    | 54 +++------------------------------
 include/drm/ttm/ttm_bo_api.h    | 28 -----------------
 include/drm/ttm/ttm_bo_driver.h | 10 ------
 3 files changed, 4 insertions(+), 88 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +4 -50
index a45038c74de6..ebecb796dd49 100644
@@ -1452,42 +1452,6 @@ int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
-int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
-{
-	struct ttm_mem_type_manager *man;
-	int ret = -EINVAL;
-
-	if (mem_type >= TTM_NUM_MEM_TYPES) {
-		pr_err("Illegal memory type %d\n", mem_type);
-		return ret;
-	}
-	man = &bdev->man[mem_type];
-
-	if (!man->has_type) {
-		pr_err("Trying to take down uninitialized memory manager type %u\n",
-		       mem_type);
-		return ret;
-	}
-
-	ttm_mem_type_manager_disable(man);
-
-	ret = 0;
-	if (mem_type > 0) {
-		ret = ttm_mem_type_manager_force_list_clean(bdev, man);
-		if (ret) {
-			pr_err("Cleanup eviction failed\n");
-			return ret;
-		}
-
-		if (man->func->takedown)
-			ret = (*man->func->takedown)(man);
-	}
-
-	ttm_mem_type_manager_cleanup(man);
-
-	return ret;
-}
-EXPORT_SYMBOL(ttm_bo_clean_mm);
 
 int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 {
@@ -1591,21 +1555,11 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 {
 	struct ttm_bo_global *glob = &ttm_bo_glob;
 	int ret = 0;
-	unsigned i = TTM_NUM_MEM_TYPES;
+	unsigned i;
 	struct ttm_mem_type_manager *man;
 
-	while (i--) {
-		man = &bdev->man[i];
-		if (man->has_type) {
-			man->use_type = false;
-			if ((i != TTM_PL_SYSTEM) && ttm_bo_clean_mm(bdev, i)) {
-				ret = -EBUSY;
-				pr_err("DRM memory manager type %d is not clean\n",
-				       i);
-			}
-			man->has_type = false;
-		}
-	}
+	man = &bdev->man[TTM_PL_SYSTEM];
+	ttm_mem_type_manager_disable(man);
 
 	mutex_lock(&ttm_global_mutex);
 	list_del(&bdev->device_list);
@@ -1618,7 +1572,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 
 	spin_lock(&glob->lru_lock);
 	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
-		if (list_empty(&bdev->man[0].lru[0]))
+		if (list_empty(&man->lru[0]))
 			pr_debug("Swap list %d was clean\n", i);
 	spin_unlock(&glob->lru_lock);
 
include/drm/ttm/ttm_bo_api.h +0 -28
index 2c84622faa44..9c55eafd0e7d 100644
@@ -546,34 +546,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
 			       struct ttm_mem_type_manager *man,
 			       unsigned long p_size);
 
-/**
- * ttm_bo_clean_mm
- *
- * @bdev: Pointer to a ttm_bo_device struct.
- * @mem_type: The memory type.
- *
- * Take down a manager for a given memory type after first walking
- * the LRU list to evict any buffers left alive.
- *
- * Normally, this function is part of lastclose() or unload(), and at that
- * point there shouldn't be any buffers left created by user-space, since
- * there should've been removed by the file descriptor release() method.
- * However, before this function is run, make sure to signal all sync objects,
- * and verify that the delayed delete queue is empty. The driver must also
- * make sure that there are no NO_EVICT buffers present in this memory type
- * when the call is made.
- *
- * If this function is part of a VT switch, the caller must make sure that
- * there are no appications currently validating buffers before this
- * function is called. The caller can do that by first taking the
- * struct ttm_bo_device::ttm_lock in write mode.
- *
- * Returns:
- * -EINVAL: invalid or uninitialized memory type.
- * -EBUSY: There are still buffers left in this memory type.
- */
-int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type);
-
 /**
  * ttm_bo_evict_mm
  *
include/drm/ttm/ttm_bo_driver.h +0 -10
index 9b4c22abc22c..8cc39cd55a14 100644
@@ -48,16 +48,6 @@
 struct ttm_mem_type_manager;
 
 struct ttm_mem_type_manager_func {
-	/**
-	 * struct ttm_mem_type_manager member takedown
-	 *
-	 * @man: Pointer to a memory type manager.
-	 *
-	 * Called to undo the setup done in init. All allocated resources
-	 * should be freed.
-	 */
-	int  (*takedown)(struct ttm_mem_type_manager *man);
-
 	/**
 	 * struct ttm_mem_type_manager member get_node
 	 *
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 35/59
#74 lore raw

Re: [PATCH 35/59] drm/ttm: make TTM responsible for cleaning system only.

Quoted 10 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Drivers should all be cleaning up their memory managers themselves now, so let the core just clean the system one up.

Remove the legacy cleaning interface.

Quoted 150 lines
---
 drivers/gpu/drm/ttm/ttm_bo.c    | 54 +++------------------------------
 include/drm/ttm/ttm_bo_api.h    | 28 -----------------
 include/drm/ttm/ttm_bo_driver.h | 10 ------
 3 files changed, 4 insertions(+), 88 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +4 -50
index a45038c74de6..ebecb796dd49 100644
@@ -1452,42 +1452,6 @@ int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
-int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
-{
-       struct ttm_mem_type_manager *man;
-       int ret = -EINVAL;
-
-       if (mem_type >= TTM_NUM_MEM_TYPES) {
-               pr_err("Illegal memory type %d\n", mem_type);
-               return ret;
-       }
-       man = &bdev->man[mem_type];
-
-       if (!man->has_type) {
-               pr_err("Trying to take down uninitialized memory manager type %u\n",
-                      mem_type);
-               return ret;
-       }
-
-       ttm_mem_type_manager_disable(man);
-
-       ret = 0;
-       if (mem_type > 0) {
-               ret = ttm_mem_type_manager_force_list_clean(bdev, man);
-               if (ret) {
-                       pr_err("Cleanup eviction failed\n");
-                       return ret;
-               }
-
-               if (man->func->takedown)
-                       ret = (*man->func->takedown)(man);
-       }
-
-       ttm_mem_type_manager_cleanup(man);
-
-       return ret;
-}
-EXPORT_SYMBOL(ttm_bo_clean_mm);
 
 int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 {
@@ -1591,21 +1555,11 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 {
        struct ttm_bo_global *glob = &ttm_bo_glob;
        int ret = 0;
-       unsigned i = TTM_NUM_MEM_TYPES;
+       unsigned i;
        struct ttm_mem_type_manager *man;
 
-       while (i--) {
-               man = &bdev->man[i];
-               if (man->has_type) {
-                       man->use_type = false;
-                       if ((i != TTM_PL_SYSTEM) && ttm_bo_clean_mm(bdev, i)) {
-                               ret = -EBUSY;
-                               pr_err("DRM memory manager type %d is not clean\n",
-                                      i);
-                       }
-                       man->has_type = false;
-               }
-       }
+       man = &bdev->man[TTM_PL_SYSTEM];
+       ttm_mem_type_manager_disable(man);
 
        mutex_lock(&ttm_global_mutex);
        list_del(&bdev->device_list);
@@ -1618,7 +1572,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 
        spin_lock(&glob->lru_lock);
        for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
-               if (list_empty(&bdev->man[0].lru[0]))
+               if (list_empty(&man->lru[0]))
                        pr_debug("Swap list %d was clean\n", i);
        spin_unlock(&glob->lru_lock);
 
include/drm/ttm/ttm_bo_api.h +0 -28
index 2c84622faa44..9c55eafd0e7d 100644
@@ -546,34 +546,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
                               struct ttm_mem_type_manager *man,
                               unsigned long p_size);
 
-/**
- * ttm_bo_clean_mm
- *
- * @bdev: Pointer to a ttm_bo_device struct.
- * @mem_type: The memory type.
- *
- * Take down a manager for a given memory type after first walking
- * the LRU list to evict any buffers left alive.
- *
- * Normally, this function is part of lastclose() or unload(), and at that
- * point there shouldn't be any buffers left created by user-space, since
- * there should've been removed by the file descriptor release() method.
- * However, before this function is run, make sure to signal all sync objects,
- * and verify that the delayed delete queue is empty. The driver must also
- * make sure that there are no NO_EVICT buffers present in this memory type
- * when the call is made.
- *
- * If this function is part of a VT switch, the caller must make sure that
- * there are no appications currently validating buffers before this
- * function is called. The caller can do that by first taking the
- * struct ttm_bo_device::ttm_lock in write mode.
- *
- * Returns:
- * -EINVAL: invalid or uninitialized memory type.
- * -EBUSY: There are still buffers left in this memory type.
- */
-int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type);
-
 /**
  * ttm_bo_evict_mm
  *
include/drm/ttm/ttm_bo_driver.h +0 -11
index 9b4c22abc22c..8cc39cd55a14 100644
@@ -48,16 +48,6 @@
 struct ttm_mem_type_manager;
 
 struct ttm_mem_type_manager_func {
-       /**
-        * struct ttm_mem_type_manager member takedown
-        *
-        * @man: Pointer to a memory type manager.
-        *
-        * Called to undo the setup done in init. All allocated resources
-        * should be freed.
-        */
-       int  (*takedown)(struct ttm_mem_type_manager *man);
-
        /**
         * struct ttm_mem_type_manager member get_node
         *
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#75 lore raw

PATCH 36/59 drm/ttm: add wrapper to get manager from bdev.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This will allow different abstractions later.

---
 drivers/gpu/drm/ttm/ttm_bo.c      | 34 +++++++++++++++----------------
 drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +++++++++---------
 drivers/gpu/drm/ttm/ttm_bo_vm.c   |  2 +-
 include/drm/ttm/ttm_bo_driver.h   |  6 ++++++
 4 files changed, 34 insertions(+), 28 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +17 -17
index ebecb796dd49..8777c323e7de 100644
@@ -108,7 +108,7 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
 			return;
 		drm_printf(&p, "  placement[%d]=0x%08X (%d)\n",
 			   i, placement->placement[i].flags, mem_type);
-		man = &bo->bdev->man[mem_type];
+		man = ttm_manager_type(bo->bdev, mem_type);
 		ttm_mem_type_manager_debug(man, &p);
 	}
 }
@@ -157,7 +157,7 @@ static void ttm_bo_add_mem_to_lru(struct ttm_buffer_object *bo,
 	if (mem->placement & TTM_PL_FLAG_NO_EVICT)
 		return;
 
-	man = &bdev->man[mem->mem_type];
+	man = ttm_manager_type(bdev, mem->mem_type);
 	list_add_tail(&bo->lru, &man->lru[bo->priority]);
 
 	if (man->use_tt && bo->ttm &&
@@ -232,7 +232,7 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
 		dma_resv_assert_held(pos->first->base.resv);
 		dma_resv_assert_held(pos->last->base.resv);
 
-		man = &pos->first->bdev->man[TTM_PL_TT];
+		man = ttm_manager_type(pos->first->bdev, TTM_PL_TT);
 		list_bulk_move_tail(&man->lru[i], &pos->first->lru,
 				    &pos->last->lru);
 	}
@@ -247,7 +247,7 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
 		dma_resv_assert_held(pos->first->base.resv);
 		dma_resv_assert_held(pos->last->base.resv);
 
-		man = &pos->first->bdev->man[TTM_PL_VRAM];
+		man = ttm_manager_type(pos->first->bdev, TTM_PL_VRAM);
 		list_bulk_move_tail(&man->lru[i], &pos->first->lru,
 				    &pos->last->lru);
 	}
@@ -273,8 +273,8 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
 				  struct ttm_operation_ctx *ctx)
 {
 	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *old_man = &bdev->man[bo->mem.mem_type];
-	struct ttm_mem_type_manager *new_man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *old_man = ttm_manager_type(bdev, bo->mem.mem_type);
+	struct ttm_mem_type_manager *new_man = ttm_manager_type(bdev, mem->mem_type);
 	int ret;
 
 	ret = ttm_mem_io_lock(old_man, true);
@@ -340,7 +340,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
 	return 0;
 
 out_err:
-	new_man = &bdev->man[bo->mem.mem_type];
+	new_man = ttm_manager_type(bdev, bo->mem.mem_type);
 	if (!new_man->use_tt) {
 		ttm_tt_destroy(bo->ttm);
 		bo->ttm = NULL;
@@ -552,7 +552,7 @@ static void ttm_bo_release(struct kref *kref)
 	struct ttm_buffer_object *bo =
 	    container_of(kref, struct ttm_buffer_object, kref);
 	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, bo->mem.mem_type);
 	size_t acc_size = bo->acc_size;
 	int ret;
 
@@ -844,7 +844,7 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo,
 			  const struct ttm_place *place,
 			  struct ttm_mem_reg *mem)
 {
-	struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);
 
 	mem->mm_node = NULL;
 	if (!man->func || !man->func->get_node)
@@ -855,7 +855,7 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo,
 
 void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem)
 {
-	struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);
 
 	if (!man->func || !man->func->put_node)
 		return;
@@ -912,7 +912,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
 				  struct ttm_operation_ctx *ctx)
 {
 	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
 	struct ww_acquire_ctx *ticket;
 	int ret;
 
@@ -1002,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,
 	if (ret)
 		return ret;
 
-	man = &bdev->man[mem_type];
+	man = ttm_manager_type(bdev, mem_type);
 	if (!man->has_type || !man->use_type)
 		return -EBUSY;
 
@@ -1065,7 +1065,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
 		if (unlikely(ret))
 			goto error;
 
-		man = &bdev->man[mem->mem_type];
+		man = ttm_manager_type(bdev, mem->mem_type);
 		ret = ttm_bo_add_move_fence(bo, man, mem, ctx->no_wait_gpu);
 		if (unlikely(ret)) {
 			ttm_bo_mem_put(bo, mem);
@@ -1455,7 +1455,7 @@ EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
 int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 {
-	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem_type);
 
 	if (mem_type == 0 || mem_type >= TTM_NUM_MEM_TYPES) {
 		pr_err("Illegal memory manager memory type %u\n", mem_type);
@@ -1558,7 +1558,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 	unsigned i;
 	struct ttm_mem_type_manager *man;
 
-	man = &bdev->man[TTM_PL_SYSTEM];
+	man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
 	ttm_mem_type_manager_disable(man);
 
 	mutex_lock(&ttm_global_mutex);
@@ -1585,7 +1585,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
 
 static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
 {
-	struct ttm_mem_type_manager *man = &bdev->man[TTM_PL_SYSTEM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
 
 	/*
 	 * Initialize the system memory buffer type.
@@ -1649,7 +1649,7 @@ void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo)
 void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo)
 {
 	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, bo->mem.mem_type);
 
 	ttm_mem_io_lock(man, false);
 	ttm_bo_unmap_virtual_locked(bo);
drivers/gpu/drm/ttm/ttm_bo_util.c +10 -10
index 1f502be0b646..879c8ded0cd8 100644
@@ -129,7 +129,7 @@ static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
 int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
 		       struct ttm_mem_reg *mem)
 {
-	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
 	int ret;
 
 	if (mem->bus.io_reserved_count++)
@@ -162,7 +162,7 @@ void ttm_mem_io_free(struct ttm_bo_device *bdev,
 
 int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo)
 {
-	struct ttm_mem_type_manager *man = &bo->bdev->man[bo->mem.mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, bo->mem.mem_type);
 	struct ttm_mem_reg *mem = &bo->mem;
 	int ret;
 
@@ -195,7 +195,7 @@ static int ttm_mem_reg_ioremap(struct ttm_bo_device *bdev,
 			       struct ttm_mem_reg *mem,
 			       void **virtual)
 {
-	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
 	int ret;
 	void *addr;
 
@@ -232,7 +232,7 @@ static void ttm_mem_reg_iounmap(struct ttm_bo_device *bdev,
 {
 	struct ttm_mem_type_manager *man;
 
-	man = &bdev->man[mem->mem_type];
+	man = ttm_manager_type(bdev, mem->mem_type);
 
 	if (virtual && mem->bus.addr == NULL)
 		iounmap(virtual);
@@ -303,7 +303,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
 		       struct ttm_mem_reg *new_mem)
 {
 	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
 	struct ttm_tt *ttm = bo->ttm;
 	struct ttm_mem_reg *old_mem = &bo->mem;
 	struct ttm_mem_reg old_copy = *old_mem;
@@ -571,7 +571,7 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo,
 		struct ttm_bo_kmap_obj *map)
 {
 	struct ttm_mem_type_manager *man =
-		&bo->bdev->man[bo->mem.mem_type];
+		ttm_manager_type(bo->bdev, bo->mem.mem_type);
 	unsigned long offset, size;
 	int ret;
 
@@ -601,7 +601,7 @@ void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map)
 {
 	struct ttm_buffer_object *bo = map->bo;
 	struct ttm_mem_type_manager *man =
-		&bo->bdev->man[bo->mem.mem_type];
+		ttm_manager_type(bo->bdev, bo->mem.mem_type);
 
 	if (!map->virtual)
 		return;
@@ -634,7 +634,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
 			      struct ttm_mem_reg *new_mem)
 {
 	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
 	struct ttm_mem_reg *old_mem = &bo->mem;
 	int ret;
 	struct ttm_buffer_object *ghost_obj;
@@ -697,8 +697,8 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
 	struct ttm_bo_device *bdev = bo->bdev;
 	struct ttm_mem_reg *old_mem = &bo->mem;
 
-	struct ttm_mem_type_manager *from = &bdev->man[old_mem->mem_type];
-	struct ttm_mem_type_manager *to = &bdev->man[new_mem->mem_type];
+	struct ttm_mem_type_manager *from = ttm_manager_type(bdev, old_mem->mem_type);
+	struct ttm_mem_type_manager *to = ttm_manager_type(bdev, new_mem->mem_type);
 
 	int ret;
 
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -1
index 468a0eb9e632..5ae679184eb5 100644
@@ -282,7 +282,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
 	vm_fault_t ret = VM_FAULT_NOPAGE;
 	unsigned long address = vmf->address;
 	struct ttm_mem_type_manager *man =
-		&bdev->man[bo->mem.mem_type];
+		ttm_manager_type(bdev, bo->mem.mem_type);
 
 	/*
 	 * Refuse to fault imported pages. This should be handled
include/drm/ttm/ttm_bo_driver.h +6 -0
index 8cc39cd55a14..e80deee3ae99 100644
@@ -444,6 +444,12 @@ struct ttm_bo_device {
 	bool no_retry;
 };
 
+static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
+							    int mem_type)
+{
+	return &bdev->man[mem_type];
+}
+
 /**
  * struct ttm_lru_bulk_move_pos
  *
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Acked-by on v1 36/59
#76 lore raw

Re: [PATCH 36/59] drm/ttm: add wrapper to get manager from bdev.

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

This will allow different abstractions later.

Quoted 264 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c      | 34 +++++++++++++++----------------
  drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +++++++++---------
  drivers/gpu/drm/ttm/ttm_bo_vm.c   |  2 +-
  include/drm/ttm/ttm_bo_driver.h   |  6 ++++++
  4 files changed, 34 insertions(+), 28 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +17 -17
index ebecb796dd49..8777c323e7de 100644
@@ -108,7 +108,7 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
  			return;
  		drm_printf(&p, "  placement[%d]=0x%08X (%d)\n",
  			   i, placement->placement[i].flags, mem_type);
-		man = &bo->bdev->man[mem_type];
+		man = ttm_manager_type(bo->bdev, mem_type);
  		ttm_mem_type_manager_debug(man, &p);
  	}
  }
@@ -157,7 +157,7 @@ static void ttm_bo_add_mem_to_lru(struct ttm_buffer_object *bo,
  	if (mem->placement & TTM_PL_FLAG_NO_EVICT)
  		return;
 
-	man = &bdev->man[mem->mem_type];
+	man = ttm_manager_type(bdev, mem->mem_type);
  	list_add_tail(&bo->lru, &man->lru[bo->priority]);
 
  	if (man->use_tt && bo->ttm &&
@@ -232,7 +232,7 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
  		dma_resv_assert_held(pos->first->base.resv);
  		dma_resv_assert_held(pos->last->base.resv);
 
-		man = &pos->first->bdev->man[TTM_PL_TT];
+		man = ttm_manager_type(pos->first->bdev, TTM_PL_TT);
  		list_bulk_move_tail(&man->lru[i], &pos->first->lru,
  				    &pos->last->lru);
  	}
@@ -247,7 +247,7 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
  		dma_resv_assert_held(pos->first->base.resv);
  		dma_resv_assert_held(pos->last->base.resv);
 
-		man = &pos->first->bdev->man[TTM_PL_VRAM];
+		man = ttm_manager_type(pos->first->bdev, TTM_PL_VRAM);
  		list_bulk_move_tail(&man->lru[i], &pos->first->lru,
  				    &pos->last->lru);
  	}
@@ -273,8 +273,8 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
  				  struct ttm_operation_ctx *ctx)
  {
  	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *old_man = &bdev->man[bo->mem.mem_type];
-	struct ttm_mem_type_manager *new_man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *old_man = ttm_manager_type(bdev, bo->mem.mem_type);
+	struct ttm_mem_type_manager *new_man = ttm_manager_type(bdev, mem->mem_type);
  	int ret;
 
  	ret = ttm_mem_io_lock(old_man, true);
@@ -340,7 +340,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
  	return 0;
 
  out_err:
-	new_man = &bdev->man[bo->mem.mem_type];
+	new_man = ttm_manager_type(bdev, bo->mem.mem_type);
  	if (!new_man->use_tt) {
  		ttm_tt_destroy(bo->ttm);
  		bo->ttm = NULL;
@@ -552,7 +552,7 @@ static void ttm_bo_release(struct kref *kref)
  	struct ttm_buffer_object *bo =
  	    container_of(kref, struct ttm_buffer_object, kref);
  	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, bo->mem.mem_type);
  	size_t acc_size = bo->acc_size;
  	int ret;
 
@@ -844,7 +844,7 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo,
  			  const struct ttm_place *place,
  			  struct ttm_mem_reg *mem)
  {
-	struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);
 
  	mem->mm_node = NULL;
  	if (!man->func || !man->func->get_node)
@@ -855,7 +855,7 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo,
 
  void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem)
  {
-	struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);
 
  	if (!man->func || !man->func->put_node)
  		return;
@@ -912,7 +912,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
  				  struct ttm_operation_ctx *ctx)
  {
  	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
  	struct ww_acquire_ctx *ticket;
  	int ret;
 
@@ -1002,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,
  	if (ret)
  		return ret;
 
-	man = &bdev->man[mem_type];
+	man = ttm_manager_type(bdev, mem_type);
  	if (!man->has_type || !man->use_type)
  		return -EBUSY;
 
@@ -1065,7 +1065,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
  		if (unlikely(ret))
  			goto error;
 
-		man = &bdev->man[mem->mem_type];
+		man = ttm_manager_type(bdev, mem->mem_type);
  		ret = ttm_bo_add_move_fence(bo, man, mem, ctx->no_wait_gpu);
  		if (unlikely(ret)) {
  			ttm_bo_mem_put(bo, mem);
@@ -1455,7 +1455,7 @@ EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
  int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  {
-	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem_type);
 
  	if (mem_type == 0 || mem_type >= TTM_NUM_MEM_TYPES) {
  		pr_err("Illegal memory manager memory type %u\n", mem_type);
@@ -1558,7 +1558,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
  	unsigned i;
  	struct ttm_mem_type_manager *man;
 
-	man = &bdev->man[TTM_PL_SYSTEM];
+	man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
  	ttm_mem_type_manager_disable(man);
 
  	mutex_lock(&ttm_global_mutex);
@@ -1585,7 +1585,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
 
  static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
  {
-	struct ttm_mem_type_manager *man = &bdev->man[TTM_PL_SYSTEM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
 
  	/*
  	 * Initialize the system memory buffer type.
@@ -1649,7 +1649,7 @@ void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo)
  void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo)
  {
  	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, bo->mem.mem_type);
 
  	ttm_mem_io_lock(man, false);
  	ttm_bo_unmap_virtual_locked(bo);
drivers/gpu/drm/ttm/ttm_bo_util.c +10 -10
index 1f502be0b646..879c8ded0cd8 100644
@@ -129,7 +129,7 @@ static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
  int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
  		       struct ttm_mem_reg *mem)
  {
-	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
  	int ret;
 
  	if (mem->bus.io_reserved_count++)
@@ -162,7 +162,7 @@ void ttm_mem_io_free(struct ttm_bo_device *bdev,
 
  int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo)
  {
-	struct ttm_mem_type_manager *man = &bo->bdev->man[bo->mem.mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, bo->mem.mem_type);
  	struct ttm_mem_reg *mem = &bo->mem;
  	int ret;
 
@@ -195,7 +195,7 @@ static int ttm_mem_reg_ioremap(struct ttm_bo_device *bdev,
  			       struct ttm_mem_reg *mem,
  			       void **virtual)
  {
-	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
  	int ret;
  	void *addr;
 
@@ -232,7 +232,7 @@ static void ttm_mem_reg_iounmap(struct ttm_bo_device *bdev,
  {
  	struct ttm_mem_type_manager *man;
 
-	man = &bdev->man[mem->mem_type];
+	man = ttm_manager_type(bdev, mem->mem_type);
 
  	if (virtual && mem->bus.addr == NULL)
  		iounmap(virtual);
@@ -303,7 +303,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
  		       struct ttm_mem_reg *new_mem)
  {
  	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
  	struct ttm_tt *ttm = bo->ttm;
  	struct ttm_mem_reg *old_mem = &bo->mem;
  	struct ttm_mem_reg old_copy = *old_mem;
@@ -571,7 +571,7 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo,
  		struct ttm_bo_kmap_obj *map)
  {
  	struct ttm_mem_type_manager *man =
-		&bo->bdev->man[bo->mem.mem_type];
+		ttm_manager_type(bo->bdev, bo->mem.mem_type);
  	unsigned long offset, size;
  	int ret;
 
@@ -601,7 +601,7 @@ void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map)
  {
  	struct ttm_buffer_object *bo = map->bo;
  	struct ttm_mem_type_manager *man =
-		&bo->bdev->man[bo->mem.mem_type];
+		ttm_manager_type(bo->bdev, bo->mem.mem_type);
 
  	if (!map->virtual)
  		return;
@@ -634,7 +634,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
  			      struct ttm_mem_reg *new_mem)
  {
  	struct ttm_bo_device *bdev = bo->bdev;
-	struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
  	struct ttm_mem_reg *old_mem = &bo->mem;
  	int ret;
  	struct ttm_buffer_object *ghost_obj;
@@ -697,8 +697,8 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
  	struct ttm_bo_device *bdev = bo->bdev;
  	struct ttm_mem_reg *old_mem = &bo->mem;
 
-	struct ttm_mem_type_manager *from = &bdev->man[old_mem->mem_type];
-	struct ttm_mem_type_manager *to = &bdev->man[new_mem->mem_type];
+	struct ttm_mem_type_manager *from = ttm_manager_type(bdev, old_mem->mem_type);
+	struct ttm_mem_type_manager *to = ttm_manager_type(bdev, new_mem->mem_type);
 
  	int ret;
 
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -1
index 468a0eb9e632..5ae679184eb5 100644
@@ -282,7 +282,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
  	vm_fault_t ret = VM_FAULT_NOPAGE;
  	unsigned long address = vmf->address;
  	struct ttm_mem_type_manager *man =
-		&bdev->man[bo->mem.mem_type];
+		ttm_manager_type(bdev, bo->mem.mem_type);
 
  	/*
  	 * Refuse to fault imported pages. This should be handled
include/drm/ttm/ttm_bo_driver.h +0 -0
index 8cc39cd55a14..e80deee3ae99 100644
@@ -444,6 +444,12 @@ struct ttm_bo_device {
  	bool no_retry;
  };

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 455

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +6 -0
 
+static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
+							    int mem_type)
+{
+	return &bdev->man[mem_type];
+}
+
  /**
   * struct ttm_lru_bulk_move_pos
   *

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

Reviewed-by
#77 lore raw

Re: [PATCH 36/59] drm/ttm: add wrapper to get manager from bdev.

Quoted 9 lines · Christian König

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

This will allow different abstractions later.

Quoted 266 lines
Quoted 266 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c      | 34 +++++++++++++++----------------
  drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +++++++++---------
  drivers/gpu/drm/ttm/ttm_bo_vm.c   |  2 +-
  include/drm/ttm/ttm_bo_driver.h   |  6 ++++++
  4 files changed, 34 insertions(+), 28 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +17 -17
index ebecb796dd49..8777c323e7de 100644
@@ -108,7 +108,7 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
                      return;
              drm_printf(&p, "  placement[%d]=0x%08X (%d)\n",
                         i, placement->placement[i].flags, mem_type);
-             man = &bo->bdev->man[mem_type];
+             man = ttm_manager_type(bo->bdev, mem_type);
              ttm_mem_type_manager_debug(man, &p);
      }
  }
@@ -157,7 +157,7 @@ static void ttm_bo_add_mem_to_lru(struct ttm_buffer_object *bo,
      if (mem->placement & TTM_PL_FLAG_NO_EVICT)
              return;
 
-     man = &bdev->man[mem->mem_type];
+     man = ttm_manager_type(bdev, mem->mem_type);
      list_add_tail(&bo->lru, &man->lru[bo->priority]);
 
      if (man->use_tt && bo->ttm &&
@@ -232,7 +232,7 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
              dma_resv_assert_held(pos->first->base.resv);
              dma_resv_assert_held(pos->last->base.resv);
 
-             man = &pos->first->bdev->man[TTM_PL_TT];
+             man = ttm_manager_type(pos->first->bdev, TTM_PL_TT);
              list_bulk_move_tail(&man->lru[i], &pos->first->lru,
                                  &pos->last->lru);
      }
@@ -247,7 +247,7 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
              dma_resv_assert_held(pos->first->base.resv);
              dma_resv_assert_held(pos->last->base.resv);
 
-             man = &pos->first->bdev->man[TTM_PL_VRAM];
+             man = ttm_manager_type(pos->first->bdev, TTM_PL_VRAM);
              list_bulk_move_tail(&man->lru[i], &pos->first->lru,
                                  &pos->last->lru);
      }
@@ -273,8 +273,8 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
                                struct ttm_operation_ctx *ctx)
  {
      struct ttm_bo_device *bdev = bo->bdev;
-     struct ttm_mem_type_manager *old_man = &bdev->man[bo->mem.mem_type];
-     struct ttm_mem_type_manager *new_man = &bdev->man[mem->mem_type];
+     struct ttm_mem_type_manager *old_man = ttm_manager_type(bdev, bo->mem.mem_type);
+     struct ttm_mem_type_manager *new_man = ttm_manager_type(bdev, mem->mem_type);
      int ret;
 
      ret = ttm_mem_io_lock(old_man, true);
@@ -340,7 +340,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
      return 0;
 
  out_err:
-     new_man = &bdev->man[bo->mem.mem_type];
+     new_man = ttm_manager_type(bdev, bo->mem.mem_type);
      if (!new_man->use_tt) {
              ttm_tt_destroy(bo->ttm);
              bo->ttm = NULL;
@@ -552,7 +552,7 @@ static void ttm_bo_release(struct kref *kref)
      struct ttm_buffer_object *bo =
          container_of(kref, struct ttm_buffer_object, kref);
      struct ttm_bo_device *bdev = bo->bdev;
-     struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, bo->mem.mem_type);
      size_t acc_size = bo->acc_size;
      int ret;
 
@@ -844,7 +844,7 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo,
                        const struct ttm_place *place,
                        struct ttm_mem_reg *mem)
  {
-     struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);
 
      mem->mm_node = NULL;
      if (!man->func || !man->func->get_node)
@@ -855,7 +855,7 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo,
 
  void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem)
  {
-     struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);
 
      if (!man->func || !man->func->put_node)
              return;
@@ -912,7 +912,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
                                struct ttm_operation_ctx *ctx)
  {
      struct ttm_bo_device *bdev = bo->bdev;
-     struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
      struct ww_acquire_ctx *ticket;
      int ret;
 
@@ -1002,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,
      if (ret)
              return ret;
 
-     man = &bdev->man[mem_type];
+     man = ttm_manager_type(bdev, mem_type);
      if (!man->has_type || !man->use_type)
              return -EBUSY;
 
@@ -1065,7 +1065,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
              if (unlikely(ret))
                      goto error;
 
-             man = &bdev->man[mem->mem_type];
+             man = ttm_manager_type(bdev, mem->mem_type);
              ret = ttm_bo_add_move_fence(bo, man, mem, ctx->no_wait_gpu);
              if (unlikely(ret)) {
                      ttm_bo_mem_put(bo, mem);
@@ -1455,7 +1455,7 @@ EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
 
  int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
  {
-     struct ttm_mem_type_manager *man = &bdev->man[mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem_type);
 
      if (mem_type == 0 || mem_type >= TTM_NUM_MEM_TYPES) {
              pr_err("Illegal memory manager memory type %u\n", mem_type);
@@ -1558,7 +1558,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
      unsigned i;
      struct ttm_mem_type_manager *man;
 
-     man = &bdev->man[TTM_PL_SYSTEM];
+     man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
      ttm_mem_type_manager_disable(man);
 
      mutex_lock(&ttm_global_mutex);
@@ -1585,7 +1585,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
 
  static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
  {
-     struct ttm_mem_type_manager *man = &bdev->man[TTM_PL_SYSTEM];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
 
      /*
       * Initialize the system memory buffer type.
@@ -1649,7 +1649,7 @@ void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo)
  void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo)
  {
      struct ttm_bo_device *bdev = bo->bdev;
-     struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, bo->mem.mem_type);
 
      ttm_mem_io_lock(man, false);
      ttm_bo_unmap_virtual_locked(bo);
drivers/gpu/drm/ttm/ttm_bo_util.c +10 -10
index 1f502be0b646..879c8ded0cd8 100644
@@ -129,7 +129,7 @@ static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
  int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
                     struct ttm_mem_reg *mem)
  {
-     struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
      int ret;
 
      if (mem->bus.io_reserved_count++)
@@ -162,7 +162,7 @@ void ttm_mem_io_free(struct ttm_bo_device *bdev,
 
  int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo)
  {
-     struct ttm_mem_type_manager *man = &bo->bdev->man[bo->mem.mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bo->bdev, bo->mem.mem_type);
      struct ttm_mem_reg *mem = &bo->mem;
      int ret;
 
@@ -195,7 +195,7 @@ static int ttm_mem_reg_ioremap(struct ttm_bo_device *bdev,
                             struct ttm_mem_reg *mem,
                             void **virtual)
  {
-     struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, mem->mem_type);
      int ret;
      void *addr;
 
@@ -232,7 +232,7 @@ static void ttm_mem_reg_iounmap(struct ttm_bo_device *bdev,
  {
      struct ttm_mem_type_manager *man;
 
-     man = &bdev->man[mem->mem_type];
+     man = ttm_manager_type(bdev, mem->mem_type);
 
      if (virtual && mem->bus.addr == NULL)
              iounmap(virtual);
@@ -303,7 +303,7 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
                     struct ttm_mem_reg *new_mem)
  {
      struct ttm_bo_device *bdev = bo->bdev;
-     struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
      struct ttm_tt *ttm = bo->ttm;
      struct ttm_mem_reg *old_mem = &bo->mem;
      struct ttm_mem_reg old_copy = *old_mem;
@@ -571,7 +571,7 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo,
              struct ttm_bo_kmap_obj *map)
  {
      struct ttm_mem_type_manager *man =
-             &bo->bdev->man[bo->mem.mem_type];
+             ttm_manager_type(bo->bdev, bo->mem.mem_type);
      unsigned long offset, size;
      int ret;
 
@@ -601,7 +601,7 @@ void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map)
  {
      struct ttm_buffer_object *bo = map->bo;
      struct ttm_mem_type_manager *man =
-             &bo->bdev->man[bo->mem.mem_type];
+             ttm_manager_type(bo->bdev, bo->mem.mem_type);
 
      if (!map->virtual)
              return;
@@ -634,7 +634,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
                            struct ttm_mem_reg *new_mem)
  {
      struct ttm_bo_device *bdev = bo->bdev;
-     struct ttm_mem_type_manager *man = &bdev->man[new_mem->mem_type];
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, new_mem->mem_type);
      struct ttm_mem_reg *old_mem = &bo->mem;
      int ret;
      struct ttm_buffer_object *ghost_obj;
@@ -697,8 +697,8 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
      struct ttm_bo_device *bdev = bo->bdev;
      struct ttm_mem_reg *old_mem = &bo->mem;
 
-     struct ttm_mem_type_manager *from = &bdev->man[old_mem->mem_type];
-     struct ttm_mem_type_manager *to = &bdev->man[new_mem->mem_type];
+     struct ttm_mem_type_manager *from = ttm_manager_type(bdev, old_mem->mem_type);
+     struct ttm_mem_type_manager *to = ttm_manager_type(bdev, new_mem->mem_type);
 
      int ret;
 
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -1
index 468a0eb9e632..5ae679184eb5 100644
@@ -282,7 +282,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
      vm_fault_t ret = VM_FAULT_NOPAGE;
      unsigned long address = vmf->address;
      struct ttm_mem_type_manager *man =
-             &bdev->man[bo->mem.mem_type];
+             ttm_manager_type(bdev, bo->mem.mem_type);
 
      /*
       * Refuse to fault imported pages. This should be handled
include/drm/ttm/ttm_bo_driver.h +0 -0
index 8cc39cd55a14..e80deee3ae99 100644
@@ -444,6 +444,12 @@ struct ttm_bo_device {
      bool no_retry;
  };
 
Quoted 14 lines

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 455

Quoted 9 lines
include/drm/ttm/ttm_bo_driver.h +6 -0
+static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
+                                                         int mem_type)
+{
+     return &bdev->man[mem_type];
+}
+
  /**
   * struct ttm_lru_bulk_move_pos
   *

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

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

author maintainer
#78 lore raw

PATCH 37/59 drm/amdgfx/ttm: use wrapper to get ttm memory managers

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c   |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c       |  6 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c   |  5 ++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 12 +++++------
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c      | 21 +++++++++++---------
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c   |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c      | 12 +++++------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 12 +++++------
 8 files changed, 39 insertions(+), 36 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +2 -1
index 1b865fed74ca..e24f421e5553 100644
@@ -517,8 +517,9 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd,
 uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)
 {
 	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
+	struct ttm_mem_type_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 
-	return amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+	return amdgpu_vram_mgr_usage(vram_man);
 }
 
 uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +3 -3
index a512ccbc4dea..9829640e1769 100644
@@ -299,7 +299,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,
 {
 	s64 time_us, increment_us;
 	u64 free_vram, total_vram, used_vram;
-
+	struct ttm_mem_type_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 	/* Allow a maximum of 200 accumulated ms. This is basically per-IB
 	 * throttling.
 	 *
@@ -316,7 +316,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,
 	}
 
 	total_vram = adev->gmc.real_vram_size - atomic64_read(&adev->vram_pin_size);
-	used_vram = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+	used_vram = amdgpu_vram_mgr_usage(vram_man);
 	free_vram = used_vram >= total_vram ? 0 : total_vram - used_vram;
 
 	spin_lock(&adev->mm_stats.lock);
@@ -363,7 +363,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,
 	if (!amdgpu_gmc_vram_full_visible(&adev->gmc)) {
 		u64 total_vis_vram = adev->gmc.visible_vram_size;
 		u64 used_vis_vram =
-			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+		  amdgpu_vram_mgr_vis_usage(vram_man);
 
 		if (used_vis_vram < total_vis_vram) {
 			u64 free_vis_vram = total_vis_vram - used_vis_vram;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -3
index aa5b54e5a1d7..d551e7c5e69d 100644
@@ -3880,7 +3880,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
 
 	amdgpu_virt_init_data_exchange(adev);
 	/* we need recover gart prior to run SMC/CP/SDMA resume */
-	amdgpu_gtt_mgr_recover(&adev->mman.bdev.man[TTM_PL_TT]);
+	amdgpu_gtt_mgr_recover(ttm_manager_type(&adev->mman.bdev, TTM_PL_TT));
 
 	r = amdgpu_device_fw_loading(adev);
 	if (r)
@@ -4079,8 +4079,7 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive,
 					amdgpu_inc_vram_lost(tmp_adev);
 				}
 
-				r = amdgpu_gtt_mgr_recover(
-					&tmp_adev->mman.bdev.man[TTM_PL_TT]);
+				r = amdgpu_gtt_mgr_recover(ttm_manager_type(&tmp_adev->mman.bdev, TTM_PL_TT));
 				if (r)
 					goto out;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +6 -6
index 28056d12b199..f0b78e88bb55 100644
@@ -48,9 +48,9 @@ static ssize_t amdgpu_mem_info_gtt_total_show(struct device *dev,
 {
 	struct drm_device *ddev = dev_get_drvdata(dev);
 	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
 	return snprintf(buf, PAGE_SIZE, "%llu\n",
-			(adev->mman.bdev.man[TTM_PL_TT].size) * PAGE_SIZE);
+			man->size * PAGE_SIZE);
 }
 
 /**
@@ -66,9 +66,9 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device *dev,
 {
 	struct drm_device *ddev = dev_get_drvdata(dev);
 	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
 	return snprintf(buf, PAGE_SIZE, "%llu\n",
-			amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]));
+			amdgpu_gtt_mgr_usage(man));
 }
 
 static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
@@ -87,7 +87,7 @@ static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
  */
 int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
 	struct amdgpu_gtt_mgr *mgr;
 	uint64_t start, size;
 	int ret;
@@ -135,7 +135,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
  */
 void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
 {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
 	struct amdgpu_gtt_mgr *mgr = man->priv;
 	int ret;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +12 -9
index a8c47aecd342..594687cc99ac 100644
@@ -594,13 +594,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 		ui64 = atomic64_read(&adev->num_vram_cpu_page_faults);
 		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
 	case AMDGPU_INFO_VRAM_USAGE:
-		ui64 = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+		ui64 = amdgpu_vram_mgr_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM));
 		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
 	case AMDGPU_INFO_VIS_VRAM_USAGE:
-		ui64 = amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+		ui64 = amdgpu_vram_mgr_vis_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM));
 		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
 	case AMDGPU_INFO_GTT_USAGE:
-		ui64 = amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
+		ui64 = amdgpu_gtt_mgr_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_TT));
 		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
 	case AMDGPU_INFO_GDS_CONFIG: {
 		struct drm_amdgpu_info_gds gds_info;
@@ -623,7 +623,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 			min(adev->gmc.visible_vram_size -
 			    atomic64_read(&adev->visible_pin_size),
 			    vram_gtt.vram_size);
-		vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size;
+		vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size;
 		vram_gtt.gtt_size *= PAGE_SIZE;
 		vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size);
 		return copy_to_user(out, &vram_gtt,
@@ -631,14 +631,17 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 	}
 	case AMDGPU_INFO_MEMORY: {
 		struct drm_amdgpu_memory_info mem;
-
+		struct ttm_mem_type_manager *vram_man =
+			ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
+		struct ttm_mem_type_manager *gtt_man =
+			ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
 		memset(&mem, 0, sizeof(mem));
 		mem.vram.total_heap_size = adev->gmc.real_vram_size;
 		mem.vram.usable_heap_size = adev->gmc.real_vram_size -
 			atomic64_read(&adev->vram_pin_size) -
 			AMDGPU_VM_RESERVED_VRAM;
 		mem.vram.heap_usage =
-			amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+			amdgpu_vram_mgr_usage(vram_man);
 		mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4;
 
 		mem.cpu_accessible_vram.total_heap_size =
@@ -648,16 +651,16 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 			    atomic64_read(&adev->visible_pin_size),
 			    mem.vram.usable_heap_size);
 		mem.cpu_accessible_vram.heap_usage =
-			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+			amdgpu_vram_mgr_vis_usage(vram_man);
 		mem.cpu_accessible_vram.max_allocation =
 			mem.cpu_accessible_vram.usable_heap_size * 3 / 4;
 
-		mem.gtt.total_heap_size = adev->mman.bdev.man[TTM_PL_TT].size;
+		mem.gtt.total_heap_size = gtt_man->size;
 		mem.gtt.total_heap_size *= PAGE_SIZE;
 		mem.gtt.usable_heap_size = mem.gtt.total_heap_size -
 			atomic64_read(&adev->gart_pin_size);
 		mem.gtt.heap_usage =
-			amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
+			amdgpu_gtt_mgr_usage(gtt_man);
 		mem.gtt.max_allocation = mem.gtt.usable_heap_size * 3 / 4;
 
 		return copy_to_user(out, &mem,
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -2
index 5ac7b5561475..ced418cba2f7 100644
@@ -449,7 +449,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,
 	 * allow fall back to GTT
 	 */
 	if (domain & AMDGPU_GEM_DOMAIN_GTT) {
-		man = &adev->mman.bdev.man[TTM_PL_TT];
+		man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
 
 		if (size < (man->size << PAGE_SHIFT))
 			return true;
@@ -458,7 +458,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,
 	}
 
 	if (domain & AMDGPU_GEM_DOMAIN_VRAM) {
-		man = &adev->mman.bdev.man[TTM_PL_VRAM];
+		man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 
 		if (size < (man->size << PAGE_SHIFT))
 			return true;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6 -6
index d7516144bb0a..1bd860877f1e 100644
@@ -67,7 +67,7 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
 				    unsigned int type,
 				    uint64_t size)
 {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, type);
 
 	man->available_caching = TTM_PL_FLAG_UNCACHED;
 	man->default_caching = TTM_PL_FLAG_UNCACHED;
@@ -2014,9 +2014,9 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 
 	amdgpu_vram_mgr_fini(adev);
 	amdgpu_gtt_mgr_fini(adev);
-	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_GDS]);
-	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_GWS]);
-	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_OA]);
+	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GDS));
+	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GWS));
+	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_OA));
 	ttm_bo_device_release(&adev->mman.bdev);
 	adev->mman.initialized = false;
 	DRM_INFO("amdgpu: ttm finalized\n");
@@ -2033,7 +2033,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
  */
 void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
 {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 	uint64_t size;
 	int r;
 
@@ -2255,7 +2255,7 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data)
 	unsigned ttm_pl = (uintptr_t)node->info_ent->data;
 	struct drm_device *dev = node->minor->dev;
 	struct amdgpu_device *adev = dev->dev_private;
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[ttm_pl];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, ttm_pl);
 	struct drm_printer p = drm_seq_file_printer(m);
 
 	man->func->debug(man, &p);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +6 -6
index c3bc9ddd437e..bc776b8f1063 100644
@@ -82,9 +82,9 @@ static ssize_t amdgpu_mem_info_vram_used_show(struct device *dev,
 {
 	struct drm_device *ddev = dev_get_drvdata(dev);
 	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 	return snprintf(buf, PAGE_SIZE, "%llu\n",
-		amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]));
+			amdgpu_vram_mgr_usage(man));
 }
 
 /**
@@ -100,9 +100,9 @@ static ssize_t amdgpu_mem_info_vis_vram_used_show(struct device *dev,
 {
 	struct drm_device *ddev = dev_get_drvdata(dev);
 	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 	return snprintf(buf, PAGE_SIZE, "%llu\n",
-		amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]));
+			amdgpu_vram_mgr_vis_usage(man));
 }
 
 static ssize_t amdgpu_mem_info_vram_vendor(struct device *dev,
@@ -170,7 +170,7 @@ static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
  */
 int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
 {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 	struct amdgpu_vram_mgr *mgr;
 	int ret;
 
@@ -207,7 +207,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
  */
 void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
 {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 	struct amdgpu_vram_mgr *mgr = man->priv;
 	int ret;
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 37/59
#79 lore raw

Re: [PATCH 37/59] drm/amdgfx/ttm: use wrapper to get ttm memory managers

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 3 lines

From: Dave Airlie <[email protected]>

Quoted 300 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c   |  3 ++-
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c       |  6 +++---
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c   |  5 ++---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 12 +++++------
  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c      | 21 +++++++++++---------
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c   |  4 ++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c      | 12 +++++------
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 12 +++++------
  8 files changed, 39 insertions(+), 36 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +2 -1
index 1b865fed74ca..e24f421e5553 100644
@@ -517,8 +517,9 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd,
  uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)
  {
  	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
+	struct ttm_mem_type_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 
-	return amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+	return amdgpu_vram_mgr_usage(vram_man);
  }
 
  uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +3 -3
index a512ccbc4dea..9829640e1769 100644
@@ -299,7 +299,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,
  {
  	s64 time_us, increment_us;
  	u64 free_vram, total_vram, used_vram;
-
+	struct ttm_mem_type_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
  	/* Allow a maximum of 200 accumulated ms. This is basically per-IB
  	 * throttling.
  	 *
@@ -316,7 +316,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,
  	}
 
  	total_vram = adev->gmc.real_vram_size - atomic64_read(&adev->vram_pin_size);
-	used_vram = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+	used_vram = amdgpu_vram_mgr_usage(vram_man);
  	free_vram = used_vram >= total_vram ? 0 : total_vram - used_vram;
 
  	spin_lock(&adev->mm_stats.lock);
@@ -363,7 +363,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,
  	if (!amdgpu_gmc_vram_full_visible(&adev->gmc)) {
  		u64 total_vis_vram = adev->gmc.visible_vram_size;
  		u64 used_vis_vram =
-			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+		  amdgpu_vram_mgr_vis_usage(vram_man);
 
  		if (used_vis_vram < total_vis_vram) {
  			u64 free_vis_vram = total_vis_vram - used_vis_vram;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -3
index aa5b54e5a1d7..d551e7c5e69d 100644
@@ -3880,7 +3880,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
 
  	amdgpu_virt_init_data_exchange(adev);
  	/* we need recover gart prior to run SMC/CP/SDMA resume */
-	amdgpu_gtt_mgr_recover(&adev->mman.bdev.man[TTM_PL_TT]);
+	amdgpu_gtt_mgr_recover(ttm_manager_type(&adev->mman.bdev, TTM_PL_TT));
 
  	r = amdgpu_device_fw_loading(adev);
  	if (r)
@@ -4079,8 +4079,7 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive,
  					amdgpu_inc_vram_lost(tmp_adev);
  				}
 
-				r = amdgpu_gtt_mgr_recover(
-					&tmp_adev->mman.bdev.man[TTM_PL_TT]);
+				r = amdgpu_gtt_mgr_recover(ttm_manager_type(&tmp_adev->mman.bdev, TTM_PL_TT));
  				if (r)
  					goto out;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +6 -6
index 28056d12b199..f0b78e88bb55 100644
@@ -48,9 +48,9 @@ static ssize_t amdgpu_mem_info_gtt_total_show(struct device *dev,
  {
  	struct drm_device *ddev = dev_get_drvdata(dev);
  	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
  	return snprintf(buf, PAGE_SIZE, "%llu\n",
-			(adev->mman.bdev.man[TTM_PL_TT].size) * PAGE_SIZE);
+			man->size * PAGE_SIZE);
  }
 
  /**
@@ -66,9 +66,9 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device *dev,
  {
  	struct drm_device *ddev = dev_get_drvdata(dev);
  	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
  	return snprintf(buf, PAGE_SIZE, "%llu\n",
-			amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]));
+			amdgpu_gtt_mgr_usage(man));
  }
 
  static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
@@ -87,7 +87,7 @@ static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
   */
  int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
  {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
  	struct amdgpu_gtt_mgr *mgr;
  	uint64_t start, size;
  	int ret;
@@ -135,7 +135,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
   */
  void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
  {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
  	struct amdgpu_gtt_mgr *mgr = man->priv;
  	int ret;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +12 -9
index a8c47aecd342..594687cc99ac 100644
@@ -594,13 +594,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
  		ui64 = atomic64_read(&adev->num_vram_cpu_page_faults);
  		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
  	case AMDGPU_INFO_VRAM_USAGE:
-		ui64 = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+		ui64 = amdgpu_vram_mgr_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM));
  		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
  	case AMDGPU_INFO_VIS_VRAM_USAGE:
-		ui64 = amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+		ui64 = amdgpu_vram_mgr_vis_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM));
  		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
  	case AMDGPU_INFO_GTT_USAGE:
-		ui64 = amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
+		ui64 = amdgpu_gtt_mgr_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_TT));
  		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
  	case AMDGPU_INFO_GDS_CONFIG: {
  		struct drm_amdgpu_info_gds gds_info;
@@ -623,7 +623,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
  			min(adev->gmc.visible_vram_size -
  			    atomic64_read(&adev->visible_pin_size),
  			    vram_gtt.vram_size);
-		vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size;
+		vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size;
  		vram_gtt.gtt_size *= PAGE_SIZE;
  		vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size);
  		return copy_to_user(out, &vram_gtt,
@@ -631,14 +631,17 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
  	}
  	case AMDGPU_INFO_MEMORY: {
  		struct drm_amdgpu_memory_info mem;
-
+		struct ttm_mem_type_manager *vram_man =
+			ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
+		struct ttm_mem_type_manager *gtt_man =
+			ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
  		memset(&mem, 0, sizeof(mem));
  		mem.vram.total_heap_size = adev->gmc.real_vram_size;
  		mem.vram.usable_heap_size = adev->gmc.real_vram_size -
  			atomic64_read(&adev->vram_pin_size) -
  			AMDGPU_VM_RESERVED_VRAM;
  		mem.vram.heap_usage =
-			amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+			amdgpu_vram_mgr_usage(vram_man);
  		mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4;
 
  		mem.cpu_accessible_vram.total_heap_size =
@@ -648,16 +651,16 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
  			    atomic64_read(&adev->visible_pin_size),
  			    mem.vram.usable_heap_size);
  		mem.cpu_accessible_vram.heap_usage =
-			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
+			amdgpu_vram_mgr_vis_usage(vram_man);
  		mem.cpu_accessible_vram.max_allocation =
  			mem.cpu_accessible_vram.usable_heap_size * 3 / 4;
 
-		mem.gtt.total_heap_size = adev->mman.bdev.man[TTM_PL_TT].size;
+		mem.gtt.total_heap_size = gtt_man->size;
  		mem.gtt.total_heap_size *= PAGE_SIZE;
  		mem.gtt.usable_heap_size = mem.gtt.total_heap_size -
  			atomic64_read(&adev->gart_pin_size);
  		mem.gtt.heap_usage =
-			amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
+			amdgpu_gtt_mgr_usage(gtt_man);
  		mem.gtt.max_allocation = mem.gtt.usable_heap_size * 3 / 4;
 
  		return copy_to_user(out, &mem,
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -2
index 5ac7b5561475..ced418cba2f7 100644
@@ -449,7 +449,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,
  	 * allow fall back to GTT
  	 */
  	if (domain & AMDGPU_GEM_DOMAIN_GTT) {
-		man = &adev->mman.bdev.man[TTM_PL_TT];
+		man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
 
  		if (size < (man->size << PAGE_SHIFT))
  			return true;
@@ -458,7 +458,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,
  	}
 
  	if (domain & AMDGPU_GEM_DOMAIN_VRAM) {
-		man = &adev->mman.bdev.man[TTM_PL_VRAM];
+		man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
 
  		if (size < (man->size << PAGE_SHIFT))
  			return true;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6 -6
index d7516144bb0a..1bd860877f1e 100644
@@ -67,7 +67,7 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
  				    unsigned int type,
  				    uint64_t size)
  {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, type);
 
  	man->available_caching = TTM_PL_FLAG_UNCACHED;
  	man->default_caching = TTM_PL_FLAG_UNCACHED;
@@ -2014,9 +2014,9 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 
  	amdgpu_vram_mgr_fini(adev);
  	amdgpu_gtt_mgr_fini(adev);
-	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_GDS]);
-	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_GWS]);
-	ttm_range_man_fini(&adev->mman.bdev, &adev->mman.bdev.man[AMDGPU_PL_OA]);
+	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GDS));
+	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GWS));
+	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_OA));
  	ttm_bo_device_release(&adev->mman.bdev);
  	adev->mman.initialized = false;
  	DRM_INFO("amdgpu: ttm finalized\n");
@@ -2033,7 +2033,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
   */
  void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
  {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
  	uint64_t size;
  	int r;
 
@@ -2255,7 +2255,7 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data)
  	unsigned ttm_pl = (uintptr_t)node->info_ent->data;
  	struct drm_device *dev = node->minor->dev;
  	struct amdgpu_device *adev = dev->dev_private;
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[ttm_pl];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, ttm_pl);
  	struct drm_printer p = drm_seq_file_printer(m);
 
  	man->func->debug(man, &p);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +5 -5
index c3bc9ddd437e..bc776b8f1063 100644
@@ -82,9 +82,9 @@ static ssize_t amdgpu_mem_info_vram_used_show(struct device *dev,
  {
  	struct drm_device *ddev = dev_get_drvdata(dev);
  	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
  	return snprintf(buf, PAGE_SIZE, "%llu\n",
-		amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]));
+			amdgpu_vram_mgr_usage(man));
  }
 
  /**
@@ -100,9 +100,9 @@ static ssize_t amdgpu_mem_info_vis_vram_used_show(struct device *dev,
  {
  	struct drm_device *ddev = dev_get_drvdata(dev);
  	struct amdgpu_device *adev = ddev->dev_private;
-
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
  	return snprintf(buf, PAGE_SIZE, "%llu\n",
-		amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]));
+			amdgpu_vram_mgr_vis_usage(man));
  }
 
  static ssize_t amdgpu_mem_info_vram_vendor(struct device *dev,
@@ -170,7 +170,7 @@ static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
   */
  int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
  {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
  	struct amdgpu_vram_mgr *mgr;
  	int ret;
 

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c int amdgpu_vram_mgr_init(struct amdgpu_device *adev) · line 213

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -1
@@ -207,7 +207,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
   */
  void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
  {
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
  	struct amdgpu_vram_mgr *mgr = man->priv;
  	int ret;
 

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

author maintainer
#80 lore raw

PATCH 38/59 drm/vram-helper: use wrapper to access memory managers

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/drm_gem_vram_helper.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -3
index 2099851c017e..a01768adb96d 100644
@@ -1075,7 +1075,7 @@ static int drm_vram_mm_debugfs(struct seq_file *m, void *data)
 {
 	struct drm_info_node *node = (struct drm_info_node *) m->private;
 	struct drm_vram_mm *vmm = node->minor->dev->vram_mm;
-	struct ttm_mem_type_manager *man = &vmm->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&vmm->bdev, TTM_PL_VRAM);
 	struct drm_printer p = drm_seq_file_printer(m);
 
 	ttm_mem_type_manager_debug(man, &p);
@@ -1103,7 +1103,7 @@ EXPORT_SYMBOL(drm_vram_mm_debugfs_init);
 static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 			    uint64_t vram_base, size_t vram_size)
 {
-	struct ttm_mem_type_manager *man = &vmm->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&vmm->bdev, TTM_PL_VRAM);
 	int ret;
 
 	vmm->vram_base = vram_base;
@@ -1127,7 +1127,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
 static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)
 {
-	ttm_range_man_fini(&vmm->bdev, &vmm->bdev.man[TTM_PL_VRAM]);
+	ttm_range_man_fini(&vmm->bdev, ttm_manager_type(&vmm->bdev, TTM_PL_VRAM));
 	ttm_bo_device_release(&vmm->bdev);
 }
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 38/59
#81 lore raw

Re: [PATCH 38/59] drm/vram-helper: use wrapper to access memory managers

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 3 lines

From: Dave Airlie <[email protected]>

Quoted 36 lines
---
 drivers/gpu/drm/drm_gem_vram_helper.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -3
index 2099851c017e..a01768adb96d 100644
@@ -1075,7 +1075,7 @@ static int drm_vram_mm_debugfs(struct seq_file *m, void *data)
 {
 	struct drm_info_node *node = (struct drm_info_node *) m->private;
 	struct drm_vram_mm *vmm = node->minor->dev->vram_mm;
-	struct ttm_mem_type_manager *man = &vmm->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&vmm->bdev, TTM_PL_VRAM);
 	struct drm_printer p = drm_seq_file_printer(m);
 
 	ttm_mem_type_manager_debug(man, &p);
@@ -1103,7 +1103,7 @@ EXPORT_SYMBOL(drm_vram_mm_debugfs_init);
 static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 			    uint64_t vram_base, size_t vram_size)
 {
-	struct ttm_mem_type_manager *man = &vmm->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&vmm->bdev, TTM_PL_VRAM);
 	int ret;
 
 	vmm->vram_base = vram_base;
@@ -1127,7 +1127,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
 static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)
 {
-	ttm_range_man_fini(&vmm->bdev, &vmm->bdev.man[TTM_PL_VRAM]);
+	ttm_range_man_fini(&vmm->bdev, ttm_manager_type(&vmm->bdev, TTM_PL_VRAM));
 	ttm_bo_device_release(&vmm->bdev);
 }
 
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

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

author maintainer
#82 lore raw

PATCH 39/59 drm/nouveau/ttm: use wrapper to access memory managers

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +4 -4
index bb310719e3f5..cc6cf04553dd 100644
@@ -156,7 +156,7 @@ nouveau_ttm_init_host(struct nouveau_drm *drm, u8 kind)
 static int
 nouveau_ttm_init_vram(struct nouveau_drm *drm)
 {
-	struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
 	struct nvif_mmu *mmu = &drm->client.mmu;
 
 	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
@@ -186,7 +186,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 static void
 nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 {
-	struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
 
 	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
 		ttm_mem_type_manager_disable(man);
@@ -199,7 +199,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
-	struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
 	unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
 	man->use_tt = true;
 	if (drm->agp.bridge) {
@@ -228,7 +228,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 static void
 nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
 {
-	struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
 
 	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
 	    drm->agp.bridge)
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 39/59
#83 lore raw

Re: [PATCH 39/59] drm/nouveau/ttm: use wrapper to access memory managers

Quoted 4 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 47 lines
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +4 -5
index bb310719e3f5..cc6cf04553dd 100644
@@ -156,7 +156,7 @@ nouveau_ttm_init_host(struct nouveau_drm *drm, u8 kind)
 static int
 nouveau_ttm_init_vram(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_VRAM];
+       struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
        struct nvif_mmu *mmu = &drm->client.mmu;
 
        man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
@@ -186,7 +186,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 static void
 nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_VRAM];
+       struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
 
        if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
                ttm_mem_type_manager_disable(man);
@@ -199,7 +199,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
+       struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
        unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
        man->use_tt = true;
        if (drm->agp.bridge) {
@@ -228,7 +228,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 static void
 nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man = &drm->ttm.bdev.man[TTM_PL_TT];
+       struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
 
        if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
            drm->agp.bridge)
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#84 lore raw

PATCH 40/59 drm/qxl/ttm: use wrapper to access memory manager

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/qxl/qxl_ttm.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +6 -5
index 0f7071829056..57c96f7271db 100644
@@ -219,7 +219,7 @@ static int qxl_ttm_init_mem_type(struct qxl_device *qdev,
 				 unsigned int type,
 				 uint64_t size)
 {
-	struct ttm_mem_type_manager *man = &qdev->mman.bdev.man[type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&qdev->mman.bdev, type);
 
 	man->available_caching = TTM_PL_MASK_CACHING;
 	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -266,8 +266,9 @@ int qxl_ttm_init(struct qxl_device *qdev)
 
 void qxl_ttm_fini(struct qxl_device *qdev)
 {
-	ttm_range_man_fini(&qdev->mman.bdev, &qdev->mman.bdev.man[TTM_PL_VRAM]);
-	ttm_range_man_fini(&qdev->mman.bdev, &qdev->mman.bdev.man[TTM_PL_PRIV]);
+
+	ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_VRAM));
+	ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_PRIV));
 	ttm_bo_device_release(&qdev->mman.bdev);
 	DRM_INFO("qxl: ttm finalized\n");
 }
@@ -302,9 +303,9 @@ void qxl_ttm_debugfs_init(struct qxl_device *qdev)
 		qxl_mem_types_list[i].show = &qxl_mm_dump_table;
 		qxl_mem_types_list[i].driver_features = 0;
 		if (i == 0)
-			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_VRAM];
+			qxl_mem_types_list[i].data = ttm_manager_type(&qdev->mman.bdev, TTM_PL_VRAM);
 		else
-			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_PRIV];
+			qxl_mem_types_list[i].data = ttm_manager_type(&qdev->mman.bdev, TTM_PL_PRIV);
 
 	}
 	qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
Signature · 6 lines
2.26.2

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

PATCH 41/59 drm/radeon/ttm: use wrapper to access memory manager

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/radeon/radeon_gem.c |  2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/radeon/radeon_gem.c +1 -1
index 44157ada9b0e..3ec028dba739 100644
@@ -226,7 +226,7 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data,
 	struct drm_radeon_gem_info *args = data;
 	struct ttm_mem_type_manager *man;
 
-	man = &rdev->mman.bdev.man[TTM_PL_VRAM];
+	man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
 
 	args->vram_size = (u64)man->size << PAGE_SHIFT;
 	args->vram_visible = rdev->mc.visible_vram_size;
drivers/gpu/drm/radeon/radeon_ttm.c +6 -6
index 76b409af9476..03c0a24e74c4 100644
@@ -68,7 +68,7 @@ struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 
 static int radeon_ttm_init_vram(struct radeon_device *rdev)
 {
-	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
 
 	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
 	man->default_caching = TTM_PL_FLAG_WC;
@@ -79,7 +79,7 @@ static int radeon_ttm_init_vram(struct radeon_device *rdev)
 
 static int radeon_ttm_init_gtt(struct radeon_device *rdev)
 {
-	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT);
 
 	man->available_caching = TTM_PL_MASK_CACHING;
 	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -825,8 +825,8 @@ void radeon_ttm_fini(struct radeon_device *rdev)
 		}
 		radeon_bo_unref(&rdev->stolen_vga_memory);
 	}
-	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_VRAM]);
-	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_TT]);
+	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM));
+	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT));
 	ttm_bo_device_release(&rdev->mman.bdev);
 	radeon_gart_fini(rdev);
 	rdev->mman.initialized = false;
@@ -842,7 +842,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
 	if (!rdev->mman.initialized)
 		return;
 
-	man = &rdev->mman.bdev.man[TTM_PL_VRAM];
+	man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
 	/* this just adjusts TTM size idea, which sets lpfn to the correct value */
 	man->size = size >> PAGE_SHIFT;
 }
@@ -896,7 +896,7 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
 	unsigned ttm_pl = *(int*)node->info_ent->data;
 	struct drm_device *dev = node->minor->dev;
 	struct radeon_device *rdev = dev->dev_private;
-	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[ttm_pl];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, ttm_pl);
 	struct drm_printer p = drm_seq_file_printer(m);
 
 	man->func->debug(man, &p);
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 41/59
#87 lore raw

Re: [PATCH 41/59] drm/radeon/ttm: use wrapper to access memory manager

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 3 lines

From: Dave Airlie <[email protected]>

Quoted 61 lines
---
  drivers/gpu/drm/radeon/radeon_gem.c |  2 +-
  drivers/gpu/drm/radeon/radeon_ttm.c | 12 ++++++------
  2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/radeon/radeon_gem.c +1 -1
index 44157ada9b0e..3ec028dba739 100644
@@ -226,7 +226,7 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data,
  	struct drm_radeon_gem_info *args = data;
  	struct ttm_mem_type_manager *man;
 
-	man = &rdev->mman.bdev.man[TTM_PL_VRAM];
+	man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
 
  	args->vram_size = (u64)man->size << PAGE_SHIFT;
  	args->vram_visible = rdev->mc.visible_vram_size;
drivers/gpu/drm/radeon/radeon_ttm.c +5 -5
index 76b409af9476..03c0a24e74c4 100644
@@ -68,7 +68,7 @@ struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 
  static int radeon_ttm_init_vram(struct radeon_device *rdev)
  {
-	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
 
  	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
  	man->default_caching = TTM_PL_FLAG_WC;
@@ -79,7 +79,7 @@ static int radeon_ttm_init_vram(struct radeon_device *rdev)
 
  static int radeon_ttm_init_gtt(struct radeon_device *rdev)
  {
-	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[TTM_PL_TT];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT);
 
  	man->available_caching = TTM_PL_MASK_CACHING;
  	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -825,8 +825,8 @@ void radeon_ttm_fini(struct radeon_device *rdev)
  		}
  		radeon_bo_unref(&rdev->stolen_vga_memory);
  	}
-	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_VRAM]);
-	ttm_range_man_fini(&rdev->mman.bdev, &rdev->mman.bdev.man[TTM_PL_TT]);
+	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM));
+	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT));
  	ttm_bo_device_release(&rdev->mman.bdev);
  	radeon_gart_fini(rdev);
  	rdev->mman.initialized = false;
@@ -842,7 +842,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
  	if (!rdev->mman.initialized)
  		return;
 
-	man = &rdev->mman.bdev.man[TTM_PL_VRAM];
+	man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
  	/* this just adjusts TTM size idea, which sets lpfn to the correct value */
  	man->size = size >> PAGE_SHIFT;
  }

drivers/gpu/drm/radeon/radeon_ttm.c static int radeon_mm_dump_table(struct seq_file *m, void *data) · line 902

Quoted 8 lines
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
@@ -896,7 +896,7 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
  	unsigned ttm_pl = *(int*)node->info_ent->data;
  	struct drm_device *dev = node->minor->dev;
  	struct radeon_device *rdev = dev->dev_private;
-	struct ttm_mem_type_manager *man = &rdev->mman.bdev.man[ttm_pl];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, ttm_pl);
  	struct drm_printer p = drm_seq_file_printer(m);
 
  	man->func->debug(man, &p);

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

author maintainer
#88 lore raw

PATCH 42/59 drm/vmwgfx/ttm: use wrapper to access memory manager

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           | 23 +++++++++++--------
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c |  4 ++--
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c           |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +14 -9
index f368a9cc0c2a..6ed92f38b54b 100644
@@ -634,7 +634,7 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
 	ret = ttm_range_man_init(&dev_priv->bdev, man,
 				 dev_priv->vram_size >> PAGE_SHIFT);
 #endif
-	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM)->use_type = false;
 	return ret;
 }
 
@@ -644,7 +644,7 @@ static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
 	vmw_thp_fini(dev_priv);
 #else
 	ttm_bo_man_fini(&dev_priv->bdev,
-			    &dev_priv->bdev.man[TTM_PL_VRAM]);
+			ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM));
 #endif
 }
 
@@ -887,7 +887,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 		DRM_ERROR("Failed initializing TTM buffer object driver.\n");
 		goto out_no_bdev;
 	}
-	dev_priv->bdev.man[TTM_PL_SYSTEM].available_caching =
+	ttm_manager_type(&dev_priv->bdev, TTM_PL_SYSTEM)->available_caching =
 		TTM_PL_FLAG_CACHED;
 
 	/*
@@ -1194,10 +1194,12 @@ static void vmw_master_drop(struct drm_device *dev,
  */
 static void __vmw_svga_enable(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
+
 	spin_lock(&dev_priv->svga_lock);
-	if (!dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
+	if (!man->use_type) {
 		vmw_write(dev_priv, SVGA_REG_ENABLE, SVGA_REG_ENABLE);
-		dev_priv->bdev.man[TTM_PL_VRAM].use_type = true;
+		man->use_type = true;
 	}
 	spin_unlock(&dev_priv->svga_lock);
 }
@@ -1223,9 +1225,11 @@ void vmw_svga_enable(struct vmw_private *dev_priv)
  */
 static void __vmw_svga_disable(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
+
 	spin_lock(&dev_priv->svga_lock);
-	if (dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
-		dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	if (man->use_type) {
+		man->use_type = false;
 		vmw_write(dev_priv, SVGA_REG_ENABLE,
 			  SVGA_REG_ENABLE_HIDE |
 			  SVGA_REG_ENABLE_ENABLE);
@@ -1242,6 +1246,7 @@ static void __vmw_svga_disable(struct vmw_private *dev_priv)
  */
 void vmw_svga_disable(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
 	/*
 	 * Disabling SVGA will turn off device modesetting capabilities, so
 	 * notify KMS about that so that it doesn't cache atomic state that
@@ -1257,8 +1262,8 @@ void vmw_svga_disable(struct vmw_private *dev_priv)
 	vmw_kms_lost_device(dev_priv->dev);
 	ttm_write_lock(&dev_priv->reservation_sem, false);
 	spin_lock(&dev_priv->svga_lock);
-	if (dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
-		dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	if (man->use_type) {
+		man->use_type = false;
 		spin_unlock(&dev_priv->svga_lock);
 		if (ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM))
 			DRM_ERROR("Failed evicting VRAM buffers.\n");
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +2 -2
index ec1b5bb01a93..54c85a59dd8b 100644
@@ -98,7 +98,7 @@ static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
 
 int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
 	struct vmwgfx_gmrid_man *gman =
 		kzalloc(sizeof(*gman), GFP_KERNEL);
 
@@ -135,7 +135,7 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 
 void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
 	struct vmwgfx_gmrid_man *gman =
 		(struct vmwgfx_gmrid_man *)man->priv;
 
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +2 -2
index 548f152b9963..720a24214c74 100644
@@ -117,7 +117,7 @@ static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 
 int vmw_thp_init(struct vmw_private *dev_priv)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
 	struct vmw_thp_manager *rman;
 	man->available_caching = TTM_PL_FLAG_CACHED;
 	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -137,7 +137,7 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 
 void vmw_thp_fini(struct vmw_private *dev_priv)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
 	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
 	struct drm_mm *mm = &rman->mm;
 	int ret;
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 42/59
#89 lore raw

Re: [PATCH 42/59] drm/vmwgfx/ttm: use wrapper to access memory manager

Quoted 3 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 136 lines
---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           | 23 +++++++++++--------
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c |  4 ++--
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c           |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +14 -9
index f368a9cc0c2a..6ed92f38b54b 100644
@@ -634,7 +634,7 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
 	ret = ttm_range_man_init(&dev_priv->bdev, man,
 				 dev_priv->vram_size >> PAGE_SHIFT);
 #endif
-	dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM)->use_type = false;
 	return ret;
 }
 
@@ -644,7 +644,7 @@ static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
 	vmw_thp_fini(dev_priv);
 #else
 	ttm_bo_man_fini(&dev_priv->bdev,
-			    &dev_priv->bdev.man[TTM_PL_VRAM]);
+			ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM));
 #endif
 }
 
@@ -887,7 +887,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 		DRM_ERROR("Failed initializing TTM buffer object driver.\n");
 		goto out_no_bdev;
 	}
-	dev_priv->bdev.man[TTM_PL_SYSTEM].available_caching =
+	ttm_manager_type(&dev_priv->bdev, TTM_PL_SYSTEM)->available_caching =
 		TTM_PL_FLAG_CACHED;
 
 	/*
@@ -1194,10 +1194,12 @@ static void vmw_master_drop(struct drm_device *dev,
  */
 static void __vmw_svga_enable(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
+
 	spin_lock(&dev_priv->svga_lock);
-	if (!dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
+	if (!man->use_type) {
 		vmw_write(dev_priv, SVGA_REG_ENABLE, SVGA_REG_ENABLE);
-		dev_priv->bdev.man[TTM_PL_VRAM].use_type = true;
+		man->use_type = true;
 	}
 	spin_unlock(&dev_priv->svga_lock);
 }
@@ -1223,9 +1225,11 @@ void vmw_svga_enable(struct vmw_private *dev_priv)
  */
 static void __vmw_svga_disable(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
+
 	spin_lock(&dev_priv->svga_lock);
-	if (dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
-		dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	if (man->use_type) {
+		man->use_type = false;
 		vmw_write(dev_priv, SVGA_REG_ENABLE,
 			  SVGA_REG_ENABLE_HIDE |
 			  SVGA_REG_ENABLE_ENABLE);
@@ -1242,6 +1246,7 @@ static void __vmw_svga_disable(struct vmw_private *dev_priv)
  */
 void vmw_svga_disable(struct vmw_private *dev_priv)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
 	/*
 	 * Disabling SVGA will turn off device modesetting capabilities, so
 	 * notify KMS about that so that it doesn't cache atomic state that
@@ -1257,8 +1262,8 @@ void vmw_svga_disable(struct vmw_private *dev_priv)
 	vmw_kms_lost_device(dev_priv->dev);
 	ttm_write_lock(&dev_priv->reservation_sem, false);
 	spin_lock(&dev_priv->svga_lock);
-	if (dev_priv->bdev.man[TTM_PL_VRAM].use_type) {
-		dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
+	if (man->use_type) {
+		man->use_type = false;
 		spin_unlock(&dev_priv->svga_lock);
 		if (ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM))
 			DRM_ERROR("Failed evicting VRAM buffers.\n");
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +2 -2
index ec1b5bb01a93..54c85a59dd8b 100644
@@ -98,7 +98,7 @@ static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
 
 int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
 	struct vmwgfx_gmrid_man *gman =
 		kzalloc(sizeof(*gman), GFP_KERNEL);
 
@@ -135,7 +135,7 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 
 void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[type];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
 	struct vmwgfx_gmrid_man *gman =
 		(struct vmwgfx_gmrid_man *)man->priv;
 
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +2 -2
index 548f152b9963..720a24214c74 100644
@@ -117,7 +117,7 @@ static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 
 int vmw_thp_init(struct vmw_private *dev_priv)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
 	struct vmw_thp_manager *rman;
 	man->available_caching = TTM_PL_FLAG_CACHED;
 	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -137,7 +137,7 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 
 void vmw_thp_fini(struct vmw_private *dev_priv)
 {
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
+	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
 	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
 	struct drm_mm *mm = &rman->mm;
 	int ret;
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#90 lore raw

PATCH 43/59 drm/ttm: rename manager variable to make sure wrapper is used.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Other users of this should notice this change and switch to wrapper.

---
 drivers/gpu/drm/ttm/ttm_bo.c    | 2 +-
 include/drm/ttm/ttm_bo_driver.h | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +1 -1
index 8777c323e7de..3a3a4dfb0fff 100644
@@ -1617,7 +1617,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
 	bdev->driver = driver;
 
-	memset(bdev->man, 0, sizeof(bdev->man));
+	memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
 
 	ttm_bo_init_sysman(bdev);
 
include/drm/ttm/ttm_bo_driver.h +5 -2
index e80deee3ae99..03b253d14e6a 100644
@@ -415,7 +415,10 @@ struct ttm_bo_device {
 	 */
 	struct list_head device_list;
 	struct ttm_bo_driver *driver;
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
+	/*
+	 * access via ttm_manager_type.
+	 */
+	struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
 
 	/*
 	 * Protected by internal locks.
@@ -447,7 +450,7 @@ struct ttm_bo_device {
 static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
 							    int mem_type)
 {
-	return &bdev->man[mem_type];
+	return &bdev->man_priv[mem_type];
 }
 
 /**
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 43/59
#91 lore raw

Re: [PATCH 43/59] drm/ttm: rename manager variable to make sure wrapper is used.

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

Other users of this should notice this change and switch to wrapper.

Quoted 35 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    | 2 +-
  include/drm/ttm/ttm_bo_driver.h | 7 +++++--
  2 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +1 -1
index 8777c323e7de..3a3a4dfb0fff 100644
@@ -1617,7 +1617,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
  	bdev->driver = driver;
 
-	memset(bdev->man, 0, sizeof(bdev->man));
+	memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
 
  	ttm_bo_init_sysman(bdev);
 
include/drm/ttm/ttm_bo_driver.h +4 -1
index e80deee3ae99..03b253d14e6a 100644
@@ -415,7 +415,10 @@ struct ttm_bo_device {
  	 */
  	struct list_head device_list;
  	struct ttm_bo_driver *driver;
-	struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
+	/*
+	 * access via ttm_manager_type.
+	 */
+	struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
 
  	/*
  	 * Protected by internal locks.

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 456

Quoted 8 lines
include/drm/ttm/ttm_bo_driver.h +1 -1
@@ -447,7 +450,7 @@ struct ttm_bo_device {
  static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
  							    int mem_type)
  {
-	return &bdev->man[mem_type];
+	return &bdev->man_priv[mem_type];
  }
 
  /**

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

Reviewed-by
#92 lore raw

Re: [PATCH 43/59] drm/ttm: rename manager variable to make sure wrapper is used.

Quoted 9 lines · Christian König

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

Other users of this should notice this change and switch to wrapper.

Quoted 43 lines
Quoted 43 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    | 2 +-
  include/drm/ttm/ttm_bo_driver.h | 7 +++++--
  2 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +1 -1
index 8777c323e7de..3a3a4dfb0fff 100644
@@ -1617,7 +1617,7 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
      bdev->driver = driver;
 
-     memset(bdev->man, 0, sizeof(bdev->man));
+     memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
 
      ttm_bo_init_sysman(bdev);
 
include/drm/ttm/ttm_bo_driver.h +5 -2
index e80deee3ae99..03b253d14e6a 100644
@@ -415,7 +415,10 @@ struct ttm_bo_device {
       */
      struct list_head device_list;
      struct ttm_bo_driver *driver;
-     struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
+     /*
+      * access via ttm_manager_type.
+      */
+     struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
 
      /*
       * Protected by internal locks.
@@ -447,7 +450,7 @@ struct ttm_bo_device {
  static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
                                                          int mem_type)
  {
-     return &bdev->man[mem_type];
+     return &bdev->man_priv[mem_type];
  }
 
Quoted 6 lines

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 456

Quoted 1 line
include/drm/ttm/ttm_bo_driver.h +0 -0
  /**

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

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

author maintainer
#93 lore raw

PATCH 44/59 drm/ttm: allow drivers to provide their own manager subclasses

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This will get removed eventually and all drivers will use this.

---
 include/drm/ttm/ttm_bo_driver.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
include/drm/ttm/ttm_bo_driver.h +10 -1
index 03b253d14e6a..6940d85a531a 100644
@@ -419,7 +419,7 @@ struct ttm_bo_device {
 	 * access via ttm_manager_type.
 	 */
 	struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
-
+	struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by internal locks.
 	 */
@@ -450,9 +450,18 @@ struct ttm_bo_device {
 static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
 							    int mem_type)
 {
+	if (bdev->man_drv[mem_type])
+		return bdev->man_drv[mem_type];
 	return &bdev->man_priv[mem_type];
 }
 
+static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,
+					  int type,
+					  struct ttm_mem_type_manager *manager)
+{
+	bdev->man_drv[type] = manager;
+}
+
 /**
  * struct ttm_lru_bulk_move_pos
  *
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 44/59
#94 lore raw

Re: [PATCH 44/59] drm/ttm: allow drivers to provide their own manager subclasses

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

This will get removed eventually and all drivers will use this.

Quoted 26 lines
---
  include/drm/ttm/ttm_bo_driver.h | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
include/drm/ttm/ttm_bo_driver.h +3 -1
index 03b253d14e6a..6940d85a531a 100644
@@ -419,7 +419,7 @@ struct ttm_bo_device {
  	 * access via ttm_manager_type.
  	 */
  	struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
-
+	struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
  	/*
  	 * Protected by internal locks.
  	 */
@@ -450,9 +450,18 @@ struct ttm_bo_device {
  static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
  							    int mem_type)
  {
+	if (bdev->man_drv[mem_type])
+		return bdev->man_drv[mem_type];
  	return &bdev->man_priv[mem_type];
  }
 

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 467

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7 -0
+static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,
+					  int type,
+					  struct ttm_mem_type_manager *manager)
+{
+	bdev->man_drv[type] = manager;
+}
+
  /**
   * struct ttm_lru_bulk_move_pos
   *

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

Reviewed-by
#95 lore raw

Re: [PATCH 44/59] drm/ttm: allow drivers to provide their own manager subclasses

Quoted 9 lines · Christian König

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

This will get removed eventually and all drivers will use this.

Quoted 27 lines
Quoted 27 lines
---
  include/drm/ttm/ttm_bo_driver.h | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
include/drm/ttm/ttm_bo_driver.h +3 -1
index 03b253d14e6a..6940d85a531a 100644
@@ -419,7 +419,7 @@ struct ttm_bo_device {
       * access via ttm_manager_type.
       */
      struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
-
+     struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
      /*
       * Protected by internal locks.
       */
@@ -450,9 +450,18 @@ struct ttm_bo_device {
  static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
                                                          int mem_type)
  {
+     if (bdev->man_drv[mem_type])
+             return bdev->man_drv[mem_type];
      return &bdev->man_priv[mem_type];
  }
 
Quoted 15 lines

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 467

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7 -0
+static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,
+                                       int type,
+                                       struct ttm_mem_type_manager *manager)
+{
+     bdev->man_drv[type] = manager;
+}
+
  /**
   * struct ttm_lru_bulk_move_pos
   *

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

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

author maintainer
#96 lore raw

PATCH 45/59 drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 35 +++++++++++--------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 36 +++++++++++++-------
 2 files changed, 44 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +21 -14
index f0b78e88bb55..b664c5cb13ce 100644
@@ -25,11 +25,17 @@
 #include "amdgpu.h"
 
 struct amdgpu_gtt_mgr {
+	struct ttm_mem_type_manager manager;
 	struct drm_mm mm;
 	spinlock_t lock;
 	atomic64_t available;
 };
 
+static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct amdgpu_gtt_mgr, manager);
+}
+
 struct amdgpu_gtt_node {
 	struct drm_mm_node node;
 	struct ttm_buffer_object *tbo;
@@ -87,11 +93,16 @@ static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
  */
 int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
+	struct ttm_mem_type_manager *man;
 	struct amdgpu_gtt_mgr *mgr;
 	uint64_t start, size;
 	int ret;
 
+	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
+	man = &mgr->manager;
 	man->use_tt = true;
 	man->func = &amdgpu_gtt_mgr_func;
 	man->available_caching = TTM_PL_MASK_CACHING;
@@ -99,16 +110,11 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 
 	ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
 
-	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-	if (!mgr)
-		return -ENOMEM;
-
 	start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
 	size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
 	drm_mm_init(&mgr->mm, start, size);
 	spin_lock_init(&mgr->lock);
 	atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
-	man->priv = mgr;
 
 	ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
 	if (ret) {
@@ -121,6 +127,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 		return ret;
 	}
 
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -136,7 +143,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
 {
 	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
 	int ret;
 
 	ttm_mem_type_manager_disable(man);
@@ -148,13 +155,13 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
 	spin_lock(&mgr->lock);
 	drm_mm_takedown(&mgr->mm);
 	spin_unlock(&mgr->lock);
-	kfree(mgr);
-	man->priv = NULL;
 
 	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);
 	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);
 
 	ttm_mem_type_manager_cleanup(man);
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, NULL);
+	kfree(mgr);
 }
 
 /**
@@ -184,7 +191,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,
 			      const struct ttm_place *place,
 			      struct ttm_mem_reg *mem)
 {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
 	struct amdgpu_gtt_node *node;
 	int r;
 
@@ -245,7 +252,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,
 static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
 			       struct ttm_mem_reg *mem)
 {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
 	struct amdgpu_gtt_node *node = mem->mm_node;
 
 	if (node) {
@@ -267,7 +274,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
  */
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)
 {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
 	s64 result = man->size - atomic64_read(&mgr->available);
 
 	return (result > 0 ? result : 0) * PAGE_SIZE;
@@ -275,7 +282,7 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)
 
 int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
 {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
 	struct amdgpu_gtt_node *node;
 	struct drm_mm_node *mm_node;
 	int r = 0;
@@ -303,7 +310,7 @@ int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
 static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
 				 struct drm_printer *printer)
 {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
 
 	spin_lock(&mgr->lock);
 	drm_mm_print(&mgr->mm, printer);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +23 -13
index bc776b8f1063..2b37f4266dcb 100644
@@ -29,12 +29,18 @@
 #include "atom.h"
 
 struct amdgpu_vram_mgr {
+	struct ttm_mem_type_manager manager;
 	struct drm_mm mm;
 	spinlock_t lock;
 	atomic64_t usage;
 	atomic64_t vis_usage;
 };
 
+static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct amdgpu_vram_mgr, manager);
+}
+
 /**
  * DOC: mem_info_vram_total
  *
@@ -170,29 +176,32 @@ static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
  */
 int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
+	struct ttm_mem_type_manager *man;
 	struct amdgpu_vram_mgr *mgr;
 	int ret;
 
+	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
+	man = &mgr->manager;
+
 	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
 	man->default_caching = TTM_PL_FLAG_WC;
 
 	ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
 
 	man->func = &amdgpu_vram_mgr_func;
-	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-	if (!mgr)
-		return -ENOMEM;
 
 	drm_mm_init(&mgr->mm, 0, man->size);
 	spin_lock_init(&mgr->lock);
-	man->priv = mgr;
 
 	/* Add the two VRAM-related sysfs files */
 	ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
 	if (ret)
 		DRM_ERROR("Failed to register sysfs\n");
 
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, &mgr->manager);
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -208,7 +217,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
 void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
 {
 	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 	int ret;
 
 	ttm_mem_type_manager_disable(man);
@@ -220,11 +229,12 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
 	spin_lock(&mgr->lock);
 	drm_mm_takedown(&mgr->mm);
 	spin_unlock(&mgr->lock);
-	kfree(mgr);
-	man->priv = NULL;
+
 	sysfs_remove_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
 
 	ttm_mem_type_manager_cleanup(man);
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, NULL);
+	kfree(mgr);
 }
 
 /**
@@ -314,7 +324,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
 			       struct ttm_mem_reg *mem)
 {
 	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 	struct drm_mm *mm = &mgr->mm;
 	struct drm_mm_node *nodes;
 	enum drm_mm_insert_mode mode;
@@ -430,7 +440,7 @@ static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man,
 				struct ttm_mem_reg *mem)
 {
 	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 	struct drm_mm_node *nodes = mem->mm_node;
 	uint64_t usage = 0, vis_usage = 0;
 	unsigned pages = mem->num_pages;
@@ -562,7 +572,7 @@ void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,
  */
 uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)
 {
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 
 	return atomic64_read(&mgr->usage);
 }
@@ -576,7 +586,7 @@ uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)
  */
 uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)
 {
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 
 	return atomic64_read(&mgr->vis_usage);
 }
@@ -592,7 +602,7 @@ uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)
 static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
 				  struct drm_printer *printer)
 {
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 
 	spin_lock(&mgr->lock);
 	drm_mm_print(&mgr->mm, printer);
Signature · 6 lines
2.26.2

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

Re: [PATCH 45/59] drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 4 lines

From: Dave Airlie <[email protected]>

This one is already reviewed and can stay like this, but I had one more idea for further cleanups, see below.

Quoted 28 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 35 +++++++++++--------
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 36 +++++++++++++-------
  2 files changed, 44 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +6 -0
index f0b78e88bb55..b664c5cb13ce 100644
@@ -25,11 +25,17 @@
  #include "amdgpu.h"
 
  struct amdgpu_gtt_mgr {
+	struct ttm_mem_type_manager manager;
  	struct drm_mm mm;
  	spinlock_t lock;
  	atomic64_t available;
  };
 
+static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct amdgpu_gtt_mgr, manager);
+}
+
  struct amdgpu_gtt_node {
  	struct drm_mm_node node;
  	struct ttm_buffer_object *tbo;

drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func; · line 101

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +2 -1
@@ -87,11 +93,16 @@ static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
   */
  int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
+	struct ttm_mem_type_manager *man;
  	struct amdgpu_gtt_mgr *mgr;
  	uint64_t start, size;
  	int ret;
 
+	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);

Why do we even kzalloc that here any more? We could just embed the structure in struct amdgpu_mman.

Same for all other drivers as well,
Christian.

Quoted 224 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +13 -13
+	if (!mgr)
+		return -ENOMEM;
+
+	man = &mgr->manager;
  	man->use_tt = true;
  	man->func = &amdgpu_gtt_mgr_func;
  	man->available_caching = TTM_PL_MASK_CACHING;
@@ -99,16 +110,11 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 
  	ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
 
-	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-	if (!mgr)
-		return -ENOMEM;
-
  	start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
  	size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
  	drm_mm_init(&mgr->mm, start, size);
  	spin_lock_init(&mgr->lock);
  	atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
-	man->priv = mgr;
 
  	ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
  	if (ret) {
@@ -121,6 +127,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
  		return ret;
  	}
 
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);
  	ttm_mem_type_manager_set_used(man, true);
  	return 0;
  }
@@ -136,7 +143,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
  void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
  {
  	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
  	int ret;
 
  	ttm_mem_type_manager_disable(man);
@@ -148,13 +155,13 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)
  	spin_lock(&mgr->lock);
  	drm_mm_takedown(&mgr->mm);
  	spin_unlock(&mgr->lock);
-	kfree(mgr);
-	man->priv = NULL;
 
  	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);
  	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);
 
  	ttm_mem_type_manager_cleanup(man);
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, NULL);
+	kfree(mgr);
  }
 
  /**
@@ -184,7 +191,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,
  			      const struct ttm_place *place,
  			      struct ttm_mem_reg *mem)
  {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
  	struct amdgpu_gtt_node *node;
  	int r;
 
@@ -245,7 +252,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,
  static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
  			       struct ttm_mem_reg *mem)
  {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
  	struct amdgpu_gtt_node *node = mem->mm_node;
 
  	if (node) {
@@ -267,7 +274,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
   */
  uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)
  {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
  	s64 result = man->size - atomic64_read(&mgr->available);
 
  	return (result > 0 ? result : 0) * PAGE_SIZE;
@@ -275,7 +282,7 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)
 
  int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
  {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
  	struct amdgpu_gtt_node *node;
  	struct drm_mm_node *mm_node;
  	int r = 0;
@@ -303,7 +310,7 @@ int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)
  static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
  				 struct drm_printer *printer)
  {
-	struct amdgpu_gtt_mgr *mgr = man->priv;
+	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
 
  	spin_lock(&mgr->lock);
  	drm_mm_print(&mgr->mm, printer);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +22 -12
index bc776b8f1063..2b37f4266dcb 100644
@@ -29,12 +29,18 @@
  #include "atom.h"
 
  struct amdgpu_vram_mgr {
+	struct ttm_mem_type_manager manager;
  	struct drm_mm mm;
  	spinlock_t lock;
  	atomic64_t usage;
  	atomic64_t vis_usage;
  };
 
+static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct amdgpu_vram_mgr, manager);
+}
+
  /**
   * DOC: mem_info_vram_total
   *
@@ -170,29 +176,32 @@ static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
   */
  int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
+	struct ttm_mem_type_manager *man;
  	struct amdgpu_vram_mgr *mgr;
  	int ret;
 
+	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
+	man = &mgr->manager;
+
  	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
  	man->default_caching = TTM_PL_FLAG_WC;
 
  	ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
 
  	man->func = &amdgpu_vram_mgr_func;
-	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-	if (!mgr)
-		return -ENOMEM;
 
  	drm_mm_init(&mgr->mm, 0, man->size);
  	spin_lock_init(&mgr->lock);
-	man->priv = mgr;
 
  	/* Add the two VRAM-related sysfs files */
  	ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
  	if (ret)
  		DRM_ERROR("Failed to register sysfs\n");
 
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, &mgr->manager);
  	ttm_mem_type_manager_set_used(man, true);
  	return 0;
  }
@@ -208,7 +217,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
  void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
  {
  	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
  	int ret;
 
  	ttm_mem_type_manager_disable(man);
@@ -220,11 +229,12 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)
  	spin_lock(&mgr->lock);
  	drm_mm_takedown(&mgr->mm);
  	spin_unlock(&mgr->lock);
-	kfree(mgr);
-	man->priv = NULL;
+
  	sysfs_remove_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
 
  	ttm_mem_type_manager_cleanup(man);
+	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, NULL);
+	kfree(mgr);
  }
 
  /**
@@ -314,7 +324,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
  			       struct ttm_mem_reg *mem)
  {
  	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
  	struct drm_mm *mm = &mgr->mm;
  	struct drm_mm_node *nodes;
  	enum drm_mm_insert_mode mode;
@@ -430,7 +440,7 @@ static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man,
  				struct ttm_mem_reg *mem)
  {
  	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
  	struct drm_mm_node *nodes = mem->mm_node;
  	uint64_t usage = 0, vis_usage = 0;
  	unsigned pages = mem->num_pages;
@@ -562,7 +572,7 @@ void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,
   */
  uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)
  {
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 
  	return atomic64_read(&mgr->usage);
  }
@@ -576,7 +586,7 @@ uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)
   */
  uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)
  {
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 
  	return atomic64_read(&mgr->vis_usage);
  }

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man) · line 608

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -1
@@ -592,7 +602,7 @@ uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)
  static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
  				  struct drm_printer *printer)
  {
-	struct amdgpu_vram_mgr *mgr = man->priv;
+	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
 
  	spin_lock(&mgr->lock);
  	drm_mm_print(&mgr->mm, printer);

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

author maintainer
#98 lore raw

PATCH 46/59 drm/ttm: make ttm_range_man_init/takedown take type + args

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This makes it easier to move these to a driver allocated system

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 15 +++++-------
 drivers/gpu/drm/drm_gem_vram_helper.c   | 10 ++++----
 drivers/gpu/drm/nouveau/nouveau_ttm.c   | 22 +++++++++++-------
 drivers/gpu/drm/qxl/qxl_ttm.c           | 13 ++++-------
 drivers/gpu/drm/radeon/radeon_ttm.c     | 31 ++++++++++++-------------
 drivers/gpu/drm/ttm/ttm_bo_manager.c    | 19 +++++++++++----
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c     | 13 ++++-------
 include/drm/ttm/ttm_bo_driver.h         | 12 +++++++---
 8 files changed, 70 insertions(+), 65 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6 -9
index 1bd860877f1e..b190d50dc9bb 100644
@@ -67,12 +67,9 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
 				    unsigned int type,
 				    uint64_t size)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, type);
-
-	man->available_caching = TTM_PL_FLAG_UNCACHED;
-	man->default_caching = TTM_PL_FLAG_UNCACHED;
-
-	return ttm_range_man_init(&adev->mman.bdev, man, size >> PAGE_SHIFT);
+	return ttm_range_man_init(&adev->mman.bdev, type,
+				  TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED,
+				  false, size >> PAGE_SHIFT);
 }
 
 /**
@@ -2014,9 +2011,9 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 
 	amdgpu_vram_mgr_fini(adev);
 	amdgpu_gtt_mgr_fini(adev);
-	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GDS));
-	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GWS));
-	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_OA));
+	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GDS);
+	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GWS);
+	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
 	ttm_bo_device_release(&adev->mman.bdev);
 	adev->mman.initialized = false;
 	DRM_INFO("amdgpu: ttm finalized\n");
drivers/gpu/drm/drm_gem_vram_helper.c +5 -5
index a01768adb96d..2187787f397e 100644
@@ -1103,7 +1103,6 @@ EXPORT_SYMBOL(drm_vram_mm_debugfs_init);
 static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 			    uint64_t vram_base, size_t vram_size)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&vmm->bdev, TTM_PL_VRAM);
 	int ret;
 
 	vmm->vram_base = vram_base;
@@ -1116,9 +1115,10 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 	if (ret)
 		return ret;
 
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-	ret = ttm_range_man_init(&vmm->bdev, man, vram_size >> PAGE_SHIFT);
+	ret = ttm_range_man_init(&vmm->bdev, TTM_PL_VRAM,
+				 TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+				 TTM_PL_FLAG_WC, false,
+				 vram_size >> PAGE_SHIFT);
 	if (ret)
 		return ret;
 
@@ -1127,7 +1127,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
 static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)
 {
-	ttm_range_man_fini(&vmm->bdev, ttm_manager_type(&vmm->bdev, TTM_PL_VRAM));
+	ttm_range_man_fini(&vmm->bdev, TTM_PL_VRAM);
 	ttm_bo_device_release(&vmm->bdev);
 }
 
drivers/gpu/drm/nouveau/nouveau_ttm.c +13 -9
index cc6cf04553dd..1c636723823c 100644
@@ -156,16 +156,17 @@ nouveau_ttm_init_host(struct nouveau_drm *drm, u8 kind)
 static int
 nouveau_ttm_init_vram(struct nouveau_drm *drm)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
 	struct nvif_mmu *mmu = &drm->client.mmu;
 
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-
 	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
+		struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
+
 		/* Some BARs do not support being ioremapped WC */
 		const u8 type = mmu->type[drm->ttm.type_vram].type;
 
+		man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+		man->default_caching = TTM_PL_FLAG_WC;
+
 		if (type & NVIF_MEM_UNCACHED) {
 			man->available_caching = TTM_PL_FLAG_UNCACHED;
 			man->default_caching = TTM_PL_FLAG_UNCACHED;
@@ -178,7 +179,9 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 		ttm_mem_type_manager_set_used(man, true);
 		return 0;
 	} else {
-		return ttm_range_man_init(&drm->ttm.bdev, man,
+		return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_VRAM,
+					  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+					  TTM_PL_FLAG_WC, false,
 					  drm->gem.vram_available >> PAGE_SHIFT);
 	}
 }
@@ -193,7 +196,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
 		ttm_mem_type_manager_cleanup(man);
 	} else
-		ttm_range_man_fini(&drm->ttm.bdev, man);
+		ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_VRAM);
 }
 
 static int
@@ -216,9 +219,10 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 	else if (!drm->agp.bridge)
 		man->func = &nv04_gart_manager;
 	else
-		return ttm_range_man_init(&drm->ttm.bdev, man,
+		return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT,
+					  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+					  TTM_PL_FLAG_WC, true,
 					  size_pages);
-
 	ttm_mem_type_manager_init(&drm->ttm.bdev, man,
 				  size_pages);
 	ttm_mem_type_manager_set_used(man, true);
@@ -232,7 +236,7 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
 
 	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
 	    drm->agp.bridge)
-		ttm_range_man_fini(&drm->ttm.bdev, man);
+		ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_TT);
 	else {
 		ttm_mem_type_manager_disable(man);
 		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
drivers/gpu/drm/qxl/qxl_ttm.c +4 -9
index 57c96f7271db..b7365b2e4c7f 100644
@@ -219,12 +219,8 @@ static int qxl_ttm_init_mem_type(struct qxl_device *qdev,
 				 unsigned int type,
 				 uint64_t size)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&qdev->mman.bdev, type);
-
-	man->available_caching = TTM_PL_MASK_CACHING;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-
-	return ttm_range_man_init(&qdev->mman.bdev, man, size);
+	return ttm_range_man_init(&qdev->mman.bdev, type, TTM_PL_MASK_CACHING,
+				  TTM_PL_FLAG_CACHED, false, size);
 }
 
 int qxl_ttm_init(struct qxl_device *qdev)
@@ -266,9 +262,8 @@ int qxl_ttm_init(struct qxl_device *qdev)
 
 void qxl_ttm_fini(struct qxl_device *qdev)
 {
-
-	ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_VRAM));
-	ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_PRIV));
+	ttm_range_man_fini(&qdev->mman.bdev, TTM_PL_VRAM);
+	ttm_range_man_fini(&qdev->mman.bdev, TTM_PL_PRIV);
 	ttm_bo_device_release(&qdev->mman.bdev);
 	DRM_INFO("qxl: ttm finalized\n");
 }
drivers/gpu/drm/radeon/radeon_ttm.c +15 -16
index 03c0a24e74c4..474d2161da1e 100644
@@ -68,35 +68,34 @@ struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 
 static int radeon_ttm_init_vram(struct radeon_device *rdev)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
-
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-
-	return ttm_range_man_init(&rdev->mman.bdev, man,
+	return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_VRAM,
+				  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+				  TTM_PL_FLAG_WC, false,
 				  rdev->mc.real_vram_size >> PAGE_SHIFT);
 }
 
 static int radeon_ttm_init_gtt(struct radeon_device *rdev)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT);
+	uint32_t available_caching, default_caching;
+
+	available_caching = TTM_PL_MASK_CACHING;
+	default_caching = TTM_PL_FLAG_CACHED;
 
-	man->available_caching = TTM_PL_MASK_CACHING;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-	man->use_tt = true;
 #if IS_ENABLED(CONFIG_AGP)
 	if (rdev->flags & RADEON_IS_AGP) {
 		if (!rdev->ddev->agp) {
 			DRM_ERROR("AGP is not enabled\n");
 			return -EINVAL;
 		}
-		man->available_caching = TTM_PL_FLAG_UNCACHED |
-					 TTM_PL_FLAG_WC;
-		man->default_caching = TTM_PL_FLAG_WC;
+		available_caching = TTM_PL_FLAG_UNCACHED |
+			TTM_PL_FLAG_WC;
+		default_caching = TTM_PL_FLAG_WC;
 	}
 #endif
 
-	return ttm_range_man_init(&rdev->mman.bdev, man,
+	return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_TT,
+				  available_caching,
+				  default_caching, true,
 				  rdev->mc.gtt_size >> PAGE_SHIFT);
 }
 
@@ -825,8 +824,8 @@ void radeon_ttm_fini(struct radeon_device *rdev)
 		}
 		radeon_bo_unref(&rdev->stolen_vga_memory);
 	}
-	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM));
-	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT));
+	ttm_range_man_fini(&rdev->mman.bdev, TTM_PL_VRAM);
+	ttm_range_man_fini(&rdev->mman.bdev, TTM_PL_TT);
 	ttm_bo_device_release(&rdev->mman.bdev);
 	radeon_gart_fini(rdev);
 	rdev->mman.initialized = false;
drivers/gpu/drm/ttm/ttm_bo_manager.c +14 -5
index 86bf5e71e959..d83cb967a107 100644
@@ -107,19 +107,27 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
 static const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 
 int ttm_range_man_init(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man,
+		       unsigned type,
+		       uint32_t available_caching,
+		       uint32_t default_caching,
+		       bool use_tt,
 		       unsigned long p_size)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
 	struct ttm_range_manager *rman;
 
-	man->func = &ttm_bo_manager_func;
-
-	ttm_mem_type_manager_init(bdev, man, p_size);
+	man->available_caching = available_caching;
+	man->default_caching = default_caching;
+	man->use_tt = use_tt;
 
 	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
 	if (!rman)
 		return -ENOMEM;
 
+	man->func = &ttm_bo_manager_func;
+
+	ttm_mem_type_manager_init(bdev, man, p_size);
+
 	drm_mm_init(&rman->mm, 0, p_size);
 	spin_lock_init(&rman->lock);
 	man->priv = rman;
@@ -130,8 +138,9 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 EXPORT_SYMBOL(ttm_range_man_init);
 
 int ttm_range_man_fini(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man)
+		       unsigned type)
 {
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
 	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
 	struct drm_mm *mm = &rman->mm;
 	int ret;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -9
index 6ed92f38b54b..7168403fb4f8 100644
@@ -626,13 +626,9 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 	ret = vmw_thp_init(dev_priv);
 #else
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
-
-	man->available_caching = TTM_PL_FLAG_CACHED;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-
-	ret = ttm_range_man_init(&dev_priv->bdev, man,
-				 dev_priv->vram_size >> PAGE_SHIFT);
+	ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM,
+				 TTM_PL_FLAG_CACHED, TTM_PL_FLAG_CACHED,
+				 false, dev_priv->vram_size >> PAGE_SHIFT);
 #endif
 	ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM)->use_type = false;
 	return ret;
@@ -643,8 +639,7 @@ static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 	vmw_thp_fini(dev_priv);
 #else
-	ttm_bo_man_fini(&dev_priv->bdev,
-			ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM));
+	ttm_bo_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
 #endif
 }
 
include/drm/ttm/ttm_bo_driver.h +9 -3
index 6940d85a531a..789c1eb26859 100644
@@ -845,14 +845,20 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
  * ttm_range_man_init
  *
  * @bdev: ttm device
- * @man: the manager to initialise with the range manager.
+ * @type: memory manager type
+ * @available_caching: TTM_PL_FLAG_* for allowed caching modes
+ * @default_caching: default caching mode
+ * @use_tt: if the memory manager uses tt
  * @p_size: size of area to be managed in pages.
  *
  * Initialise a generic range manager for the selected memory type.
  * The range manager is installed for this device in the type slot.
  */
 int ttm_range_man_init(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man,
+		       unsigned type,
+		       uint32_t available_caching,
+		       uint32_t default_caching,
+		       bool use_tt,
 		       unsigned long p_size);
 
 /**
@@ -864,7 +870,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
  * Remove the generic range manager from a slot and tear it down.
  */
 int ttm_range_man_fini(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man);
+		       unsigned type);
 
 /**
  * ttm_mem_type_manager_debug
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 46/59
#99 lore raw

Re: [PATCH 46/59] drm/ttm: make ttm_range_man_init/takedown take type + args

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

This makes it easier to move these to a driver allocated system

Quoted 348 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 15 +++++-------
  drivers/gpu/drm/drm_gem_vram_helper.c   | 10 ++++----
  drivers/gpu/drm/nouveau/nouveau_ttm.c   | 22 +++++++++++-------
  drivers/gpu/drm/qxl/qxl_ttm.c           | 13 ++++-------
  drivers/gpu/drm/radeon/radeon_ttm.c     | 31 ++++++++++++-------------
  drivers/gpu/drm/ttm/ttm_bo_manager.c    | 19 +++++++++++----
  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c     | 13 ++++-------
  include/drm/ttm/ttm_bo_driver.h         | 12 +++++++---
  8 files changed, 70 insertions(+), 65 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6 -9
index 1bd860877f1e..b190d50dc9bb 100644
@@ -67,12 +67,9 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
  				    unsigned int type,
  				    uint64_t size)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, type);
-
-	man->available_caching = TTM_PL_FLAG_UNCACHED;
-	man->default_caching = TTM_PL_FLAG_UNCACHED;
-
-	return ttm_range_man_init(&adev->mman.bdev, man, size >> PAGE_SHIFT);
+	return ttm_range_man_init(&adev->mman.bdev, type,
+				  TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED,
+				  false, size >> PAGE_SHIFT);
  }
 
  /**
@@ -2014,9 +2011,9 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 
  	amdgpu_vram_mgr_fini(adev);
  	amdgpu_gtt_mgr_fini(adev);
-	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GDS));
-	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GWS));
-	ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_OA));
+	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GDS);
+	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GWS);
+	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
  	ttm_bo_device_release(&adev->mman.bdev);
  	adev->mman.initialized = false;
  	DRM_INFO("amdgpu: ttm finalized\n");
drivers/gpu/drm/drm_gem_vram_helper.c +5 -5
index a01768adb96d..2187787f397e 100644
@@ -1103,7 +1103,6 @@ EXPORT_SYMBOL(drm_vram_mm_debugfs_init);
  static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
  			    uint64_t vram_base, size_t vram_size)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&vmm->bdev, TTM_PL_VRAM);
  	int ret;
 
  	vmm->vram_base = vram_base;
@@ -1116,9 +1115,10 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
  	if (ret)
  		return ret;
 
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-	ret = ttm_range_man_init(&vmm->bdev, man, vram_size >> PAGE_SHIFT);
+	ret = ttm_range_man_init(&vmm->bdev, TTM_PL_VRAM,
+				 TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+				 TTM_PL_FLAG_WC, false,
+				 vram_size >> PAGE_SHIFT);
  	if (ret)
  		return ret;
 
@@ -1127,7 +1127,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
  static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)
  {
-	ttm_range_man_fini(&vmm->bdev, ttm_manager_type(&vmm->bdev, TTM_PL_VRAM));
+	ttm_range_man_fini(&vmm->bdev, TTM_PL_VRAM);
  	ttm_bo_device_release(&vmm->bdev);
  }
 
drivers/gpu/drm/nouveau/nouveau_ttm.c +13 -9
index cc6cf04553dd..1c636723823c 100644
@@ -156,16 +156,17 @@ nouveau_ttm_init_host(struct nouveau_drm *drm, u8 kind)
  static int
  nouveau_ttm_init_vram(struct nouveau_drm *drm)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
  	struct nvif_mmu *mmu = &drm->client.mmu;
 
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-
  	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
+		struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
+
  		/* Some BARs do not support being ioremapped WC */
  		const u8 type = mmu->type[drm->ttm.type_vram].type;
 
+		man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+		man->default_caching = TTM_PL_FLAG_WC;
+
  		if (type & NVIF_MEM_UNCACHED) {
  			man->available_caching = TTM_PL_FLAG_UNCACHED;
  			man->default_caching = TTM_PL_FLAG_UNCACHED;
@@ -178,7 +179,9 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
  		ttm_mem_type_manager_set_used(man, true);
  		return 0;
  	} else {
-		return ttm_range_man_init(&drm->ttm.bdev, man,
+		return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_VRAM,
+					  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+					  TTM_PL_FLAG_WC, false,
  					  drm->gem.vram_available >> PAGE_SHIFT);
  	}
  }
@@ -193,7 +196,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
  		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
  		ttm_mem_type_manager_cleanup(man);
  	} else
-		ttm_range_man_fini(&drm->ttm.bdev, man);
+		ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_VRAM);
  }
 
  static int
@@ -216,9 +219,10 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
  	else if (!drm->agp.bridge)
  		man->func = &nv04_gart_manager;
  	else
-		return ttm_range_man_init(&drm->ttm.bdev, man,
+		return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT,
+					  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+					  TTM_PL_FLAG_WC, true,
  					  size_pages);
-
  	ttm_mem_type_manager_init(&drm->ttm.bdev, man,
  				  size_pages);
  	ttm_mem_type_manager_set_used(man, true);
@@ -232,7 +236,7 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
 
  	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
  	    drm->agp.bridge)
-		ttm_range_man_fini(&drm->ttm.bdev, man);
+		ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_TT);
  	else {
  		ttm_mem_type_manager_disable(man);
  		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
drivers/gpu/drm/qxl/qxl_ttm.c +4 -9
index 57c96f7271db..b7365b2e4c7f 100644
@@ -219,12 +219,8 @@ static int qxl_ttm_init_mem_type(struct qxl_device *qdev,
  				 unsigned int type,
  				 uint64_t size)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&qdev->mman.bdev, type);
-
-	man->available_caching = TTM_PL_MASK_CACHING;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-
-	return ttm_range_man_init(&qdev->mman.bdev, man, size);
+	return ttm_range_man_init(&qdev->mman.bdev, type, TTM_PL_MASK_CACHING,
+				  TTM_PL_FLAG_CACHED, false, size);
  }
 
  int qxl_ttm_init(struct qxl_device *qdev)
@@ -266,9 +262,8 @@ int qxl_ttm_init(struct qxl_device *qdev)
 
  void qxl_ttm_fini(struct qxl_device *qdev)
  {
-
-	ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_VRAM));
-	ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_PRIV));
+	ttm_range_man_fini(&qdev->mman.bdev, TTM_PL_VRAM);
+	ttm_range_man_fini(&qdev->mman.bdev, TTM_PL_PRIV);
  	ttm_bo_device_release(&qdev->mman.bdev);
  	DRM_INFO("qxl: ttm finalized\n");
  }
drivers/gpu/drm/radeon/radeon_ttm.c +15 -16
index 03c0a24e74c4..474d2161da1e 100644
@@ -68,35 +68,34 @@ struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 
  static int radeon_ttm_init_vram(struct radeon_device *rdev)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
-
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-
-	return ttm_range_man_init(&rdev->mman.bdev, man,
+	return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_VRAM,
+				  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+				  TTM_PL_FLAG_WC, false,
  				  rdev->mc.real_vram_size >> PAGE_SHIFT);
  }
 
  static int radeon_ttm_init_gtt(struct radeon_device *rdev)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT);
+	uint32_t available_caching, default_caching;
+
+	available_caching = TTM_PL_MASK_CACHING;
+	default_caching = TTM_PL_FLAG_CACHED;
 
-	man->available_caching = TTM_PL_MASK_CACHING;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-	man->use_tt = true;
  #if IS_ENABLED(CONFIG_AGP)
  	if (rdev->flags & RADEON_IS_AGP) {
  		if (!rdev->ddev->agp) {
  			DRM_ERROR("AGP is not enabled\n");
  			return -EINVAL;
  		}
-		man->available_caching = TTM_PL_FLAG_UNCACHED |
-					 TTM_PL_FLAG_WC;
-		man->default_caching = TTM_PL_FLAG_WC;
+		available_caching = TTM_PL_FLAG_UNCACHED |
+			TTM_PL_FLAG_WC;
+		default_caching = TTM_PL_FLAG_WC;
  	}
  #endif
 
-	return ttm_range_man_init(&rdev->mman.bdev, man,
+	return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_TT,
+				  available_caching,
+				  default_caching, true,
  				  rdev->mc.gtt_size >> PAGE_SHIFT);
  }
 
@@ -825,8 +824,8 @@ void radeon_ttm_fini(struct radeon_device *rdev)
  		}
  		radeon_bo_unref(&rdev->stolen_vga_memory);
  	}
-	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM));
-	ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT));
+	ttm_range_man_fini(&rdev->mman.bdev, TTM_PL_VRAM);
+	ttm_range_man_fini(&rdev->mman.bdev, TTM_PL_TT);
  	ttm_bo_device_release(&rdev->mman.bdev);
  	radeon_gart_fini(rdev);
  	rdev->mman.initialized = false;
drivers/gpu/drm/ttm/ttm_bo_manager.c +14 -5
index 86bf5e71e959..d83cb967a107 100644
@@ -107,19 +107,27 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
  static const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 
  int ttm_range_man_init(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man,
+		       unsigned type,
+		       uint32_t available_caching,
+		       uint32_t default_caching,
+		       bool use_tt,
  		       unsigned long p_size)
  {
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
  	struct ttm_range_manager *rman;
 
-	man->func = &ttm_bo_manager_func;
-
-	ttm_mem_type_manager_init(bdev, man, p_size);
+	man->available_caching = available_caching;
+	man->default_caching = default_caching;
+	man->use_tt = use_tt;
 
  	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
  	if (!rman)
  		return -ENOMEM;
 
+	man->func = &ttm_bo_manager_func;
+
+	ttm_mem_type_manager_init(bdev, man, p_size);
+
  	drm_mm_init(&rman->mm, 0, p_size);
  	spin_lock_init(&rman->lock);
  	man->priv = rman;
@@ -130,8 +138,9 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
  EXPORT_SYMBOL(ttm_range_man_init);
 
  int ttm_range_man_fini(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man)
+		       unsigned type)
  {
+	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
  	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
  	struct drm_mm *mm = &rman->mm;
  	int ret;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -9
index 6ed92f38b54b..7168403fb4f8 100644
@@ -626,13 +626,9 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  	ret = vmw_thp_init(dev_priv);
  #else
-	struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
-
-	man->available_caching = TTM_PL_FLAG_CACHED;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-
-	ret = ttm_range_man_init(&dev_priv->bdev, man,
-				 dev_priv->vram_size >> PAGE_SHIFT);
+	ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM,
+				 TTM_PL_FLAG_CACHED, TTM_PL_FLAG_CACHED,
+				 false, dev_priv->vram_size >> PAGE_SHIFT);
  #endif
  	ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM)->use_type = false;
  	return ret;
@@ -643,8 +639,7 @@ static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  	vmw_thp_fini(dev_priv);
  #else
-	ttm_bo_man_fini(&dev_priv->bdev,
-			ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM));
+	ttm_bo_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
  #endif
  }
 
include/drm/ttm/ttm_bo_driver.h +8 -2
index 6940d85a531a..789c1eb26859 100644
@@ -845,14 +845,20 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
   * ttm_range_man_init
   *
   * @bdev: ttm device
- * @man: the manager to initialise with the range manager.
+ * @type: memory manager type
+ * @available_caching: TTM_PL_FLAG_* for allowed caching modes
+ * @default_caching: default caching mode
+ * @use_tt: if the memory manager uses tt
   * @p_size: size of area to be managed in pages.
   *
   * Initialise a generic range manager for the selected memory type.
   * The range manager is installed for this device in the type slot.
   */
  int ttm_range_man_init(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man,
+		       unsigned type,
+		       uint32_t available_caching,
+		       uint32_t default_caching,
+		       bool use_tt,
  		       unsigned long p_size);
 
  /**

include/drm/ttm/ttm_bo_driver.h int ttm_range_man_init(struct ttm_bo_device *bdev, · line 876

Quoted 8 lines
include/drm/ttm/ttm_bo_driver.h +1 -1
@@ -864,7 +870,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
   * Remove the generic range manager from a slot and tear it down.
   */
  int ttm_range_man_fini(struct ttm_bo_device *bdev,
-		       struct ttm_mem_type_manager *man);
+		       unsigned type);
 
  /**
   * ttm_mem_type_manager_debug

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

Reviewed-by
#100 lore raw

Re: [PATCH 46/59] drm/ttm: make ttm_range_man_init/takedown take type + args

Quoted 9 lines · Christian König

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

This makes it easier to move these to a driver allocated system

Quoted 355 lines
Quoted 355 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 15 +++++-------
  drivers/gpu/drm/drm_gem_vram_helper.c   | 10 ++++----
  drivers/gpu/drm/nouveau/nouveau_ttm.c   | 22 +++++++++++-------
  drivers/gpu/drm/qxl/qxl_ttm.c           | 13 ++++-------
  drivers/gpu/drm/radeon/radeon_ttm.c     | 31 ++++++++++++-------------
  drivers/gpu/drm/ttm/ttm_bo_manager.c    | 19 +++++++++++----
  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c     | 13 ++++-------
  include/drm/ttm/ttm_bo_driver.h         | 12 +++++++---
  8 files changed, 70 insertions(+), 65 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6 -9
index 1bd860877f1e..b190d50dc9bb 100644
@@ -67,12 +67,9 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
                                  unsigned int type,
                                  uint64_t size)
  {
-     struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, type);
-
-     man->available_caching = TTM_PL_FLAG_UNCACHED;
-     man->default_caching = TTM_PL_FLAG_UNCACHED;
-
-     return ttm_range_man_init(&adev->mman.bdev, man, size >> PAGE_SHIFT);
+     return ttm_range_man_init(&adev->mman.bdev, type,
+                               TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED,
+                               false, size >> PAGE_SHIFT);
  }
 
  /**
@@ -2014,9 +2011,9 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 
      amdgpu_vram_mgr_fini(adev);
      amdgpu_gtt_mgr_fini(adev);
-     ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GDS));
-     ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_GWS));
-     ttm_range_man_fini(&adev->mman.bdev, ttm_manager_type(&adev->mman.bdev, AMDGPU_PL_OA));
+     ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GDS);
+     ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GWS);
+     ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
      ttm_bo_device_release(&adev->mman.bdev);
      adev->mman.initialized = false;
      DRM_INFO("amdgpu: ttm finalized\n");
drivers/gpu/drm/drm_gem_vram_helper.c +5 -5
index a01768adb96d..2187787f397e 100644
@@ -1103,7 +1103,6 @@ EXPORT_SYMBOL(drm_vram_mm_debugfs_init);
  static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
                          uint64_t vram_base, size_t vram_size)
  {
-     struct ttm_mem_type_manager *man = ttm_manager_type(&vmm->bdev, TTM_PL_VRAM);
      int ret;
 
      vmm->vram_base = vram_base;
@@ -1116,9 +1115,10 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
      if (ret)
              return ret;
 
-     man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-     man->default_caching = TTM_PL_FLAG_WC;
-     ret = ttm_range_man_init(&vmm->bdev, man, vram_size >> PAGE_SHIFT);
+     ret = ttm_range_man_init(&vmm->bdev, TTM_PL_VRAM,
+                              TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+                              TTM_PL_FLAG_WC, false,
+                              vram_size >> PAGE_SHIFT);
      if (ret)
              return ret;
 
@@ -1127,7 +1127,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
  static void drm_vram_mm_cleanup(struct drm_vram_mm *vmm)
  {
-     ttm_range_man_fini(&vmm->bdev, ttm_manager_type(&vmm->bdev, TTM_PL_VRAM));
+     ttm_range_man_fini(&vmm->bdev, TTM_PL_VRAM);
      ttm_bo_device_release(&vmm->bdev);
  }
 
drivers/gpu/drm/nouveau/nouveau_ttm.c +13 -9
index cc6cf04553dd..1c636723823c 100644
@@ -156,16 +156,17 @@ nouveau_ttm_init_host(struct nouveau_drm *drm, u8 kind)
  static int
  nouveau_ttm_init_vram(struct nouveau_drm *drm)
  {
-     struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
      struct nvif_mmu *mmu = &drm->client.mmu;
 
-     man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-     man->default_caching = TTM_PL_FLAG_WC;
-
      if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
+             struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
+
              /* Some BARs do not support being ioremapped WC */
              const u8 type = mmu->type[drm->ttm.type_vram].type;
 
+             man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+             man->default_caching = TTM_PL_FLAG_WC;
+
              if (type & NVIF_MEM_UNCACHED) {
                      man->available_caching = TTM_PL_FLAG_UNCACHED;
                      man->default_caching = TTM_PL_FLAG_UNCACHED;
@@ -178,7 +179,9 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
              ttm_mem_type_manager_set_used(man, true);
              return 0;
      } else {
-             return ttm_range_man_init(&drm->ttm.bdev, man,
+             return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_VRAM,
+                                       TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+                                       TTM_PL_FLAG_WC, false,
                                        drm->gem.vram_available >> PAGE_SHIFT);
      }
  }
@@ -193,7 +196,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
              ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
              ttm_mem_type_manager_cleanup(man);
      } else
-             ttm_range_man_fini(&drm->ttm.bdev, man);
+             ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_VRAM);
  }
 
  static int
@@ -216,9 +219,10 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
      else if (!drm->agp.bridge)
              man->func = &nv04_gart_manager;
      else
-             return ttm_range_man_init(&drm->ttm.bdev, man,
+             return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT,
+                                       TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+                                       TTM_PL_FLAG_WC, true,
                                        size_pages);
-
      ttm_mem_type_manager_init(&drm->ttm.bdev, man,
                                size_pages);
      ttm_mem_type_manager_set_used(man, true);
@@ -232,7 +236,7 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
 
      if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
          drm->agp.bridge)
-             ttm_range_man_fini(&drm->ttm.bdev, man);
+             ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_TT);
      else {
              ttm_mem_type_manager_disable(man);
              ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
drivers/gpu/drm/qxl/qxl_ttm.c +4 -9
index 57c96f7271db..b7365b2e4c7f 100644
@@ -219,12 +219,8 @@ static int qxl_ttm_init_mem_type(struct qxl_device *qdev,
                               unsigned int type,
                               uint64_t size)
  {
-     struct ttm_mem_type_manager *man = ttm_manager_type(&qdev->mman.bdev, type);
-
-     man->available_caching = TTM_PL_MASK_CACHING;
-     man->default_caching = TTM_PL_FLAG_CACHED;
-
-     return ttm_range_man_init(&qdev->mman.bdev, man, size);
+     return ttm_range_man_init(&qdev->mman.bdev, type, TTM_PL_MASK_CACHING,
+                               TTM_PL_FLAG_CACHED, false, size);
  }
 
  int qxl_ttm_init(struct qxl_device *qdev)
@@ -266,9 +262,8 @@ int qxl_ttm_init(struct qxl_device *qdev)
 
  void qxl_ttm_fini(struct qxl_device *qdev)
  {
-
-     ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_VRAM));
-     ttm_range_man_fini(&qdev->mman.bdev, ttm_manager_type(&qdev->mman.bdev, TTM_PL_PRIV));
+     ttm_range_man_fini(&qdev->mman.bdev, TTM_PL_VRAM);
+     ttm_range_man_fini(&qdev->mman.bdev, TTM_PL_PRIV);
      ttm_bo_device_release(&qdev->mman.bdev);
      DRM_INFO("qxl: ttm finalized\n");
  }
drivers/gpu/drm/radeon/radeon_ttm.c +15 -16
index 03c0a24e74c4..474d2161da1e 100644
@@ -68,35 +68,34 @@ struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 
  static int radeon_ttm_init_vram(struct radeon_device *rdev)
  {
-     struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM);
-
-     man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-     man->default_caching = TTM_PL_FLAG_WC;
-
-     return ttm_range_man_init(&rdev->mman.bdev, man,
+     return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_VRAM,
+                               TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
+                               TTM_PL_FLAG_WC, false,
                                rdev->mc.real_vram_size >> PAGE_SHIFT);
  }
 
  static int radeon_ttm_init_gtt(struct radeon_device *rdev)
  {
-     struct ttm_mem_type_manager *man = ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT);
+     uint32_t available_caching, default_caching;
+
+     available_caching = TTM_PL_MASK_CACHING;
+     default_caching = TTM_PL_FLAG_CACHED;
 
-     man->available_caching = TTM_PL_MASK_CACHING;
-     man->default_caching = TTM_PL_FLAG_CACHED;
-     man->use_tt = true;
  #if IS_ENABLED(CONFIG_AGP)
      if (rdev->flags & RADEON_IS_AGP) {
              if (!rdev->ddev->agp) {
                      DRM_ERROR("AGP is not enabled\n");
                      return -EINVAL;
              }
-             man->available_caching = TTM_PL_FLAG_UNCACHED |
-                                      TTM_PL_FLAG_WC;
-             man->default_caching = TTM_PL_FLAG_WC;
+             available_caching = TTM_PL_FLAG_UNCACHED |
+                     TTM_PL_FLAG_WC;
+             default_caching = TTM_PL_FLAG_WC;
      }
  #endif
 
-     return ttm_range_man_init(&rdev->mman.bdev, man,
+     return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_TT,
+                               available_caching,
+                               default_caching, true,
                                rdev->mc.gtt_size >> PAGE_SHIFT);
  }
 
@@ -825,8 +824,8 @@ void radeon_ttm_fini(struct radeon_device *rdev)
              }
              radeon_bo_unref(&rdev->stolen_vga_memory);
      }
-     ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_VRAM));
-     ttm_range_man_fini(&rdev->mman.bdev, ttm_manager_type(&rdev->mman.bdev, TTM_PL_TT));
+     ttm_range_man_fini(&rdev->mman.bdev, TTM_PL_VRAM);
+     ttm_range_man_fini(&rdev->mman.bdev, TTM_PL_TT);
      ttm_bo_device_release(&rdev->mman.bdev);
      radeon_gart_fini(rdev);
      rdev->mman.initialized = false;
drivers/gpu/drm/ttm/ttm_bo_manager.c +14 -5
index 86bf5e71e959..d83cb967a107 100644
@@ -107,19 +107,27 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
  static const struct ttm_mem_type_manager_func ttm_bo_manager_func;
 
  int ttm_range_man_init(struct ttm_bo_device *bdev,
-                    struct ttm_mem_type_manager *man,
+                    unsigned type,
+                    uint32_t available_caching,
+                    uint32_t default_caching,
+                    bool use_tt,
                     unsigned long p_size)
  {
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
      struct ttm_range_manager *rman;
 
-     man->func = &ttm_bo_manager_func;
-
-     ttm_mem_type_manager_init(bdev, man, p_size);
+     man->available_caching = available_caching;
+     man->default_caching = default_caching;
+     man->use_tt = use_tt;
 
      rman = kzalloc(sizeof(*rman), GFP_KERNEL);
      if (!rman)
              return -ENOMEM;
 
+     man->func = &ttm_bo_manager_func;
+
+     ttm_mem_type_manager_init(bdev, man, p_size);
+
      drm_mm_init(&rman->mm, 0, p_size);
      spin_lock_init(&rman->lock);
      man->priv = rman;
@@ -130,8 +138,9 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
  EXPORT_SYMBOL(ttm_range_man_init);
 
  int ttm_range_man_fini(struct ttm_bo_device *bdev,
-                    struct ttm_mem_type_manager *man)
+                    unsigned type)
  {
+     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
      struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
      struct drm_mm *mm = &rman->mm;
      int ret;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +4 -9
index 6ed92f38b54b..7168403fb4f8 100644
@@ -626,13 +626,9 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
      ret = vmw_thp_init(dev_priv);
  #else
-     struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
-
-     man->available_caching = TTM_PL_FLAG_CACHED;
-     man->default_caching = TTM_PL_FLAG_CACHED;
-
-     ret = ttm_range_man_init(&dev_priv->bdev, man,
-                              dev_priv->vram_size >> PAGE_SHIFT);
+     ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM,
+                              TTM_PL_FLAG_CACHED, TTM_PL_FLAG_CACHED,
+                              false, dev_priv->vram_size >> PAGE_SHIFT);
  #endif
      ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM)->use_type = false;
      return ret;
@@ -643,8 +639,7 @@ static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
      vmw_thp_fini(dev_priv);
  #else
-     ttm_bo_man_fini(&dev_priv->bdev,
-                     ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM));
+     ttm_bo_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
  #endif
  }
 
include/drm/ttm/ttm_bo_driver.h +9 -3
index 6940d85a531a..789c1eb26859 100644
@@ -845,14 +845,20 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
   * ttm_range_man_init
   *
   * @bdev: ttm device
- * @man: the manager to initialise with the range manager.
+ * @type: memory manager type
+ * @available_caching: TTM_PL_FLAG_* for allowed caching modes
+ * @default_caching: default caching mode
+ * @use_tt: if the memory manager uses tt
   * @p_size: size of area to be managed in pages.
   *
   * Initialise a generic range manager for the selected memory type.
   * The range manager is installed for this device in the type slot.
   */
  int ttm_range_man_init(struct ttm_bo_device *bdev,
-                    struct ttm_mem_type_manager *man,
+                    unsigned type,
+                    uint32_t available_caching,
+                    uint32_t default_caching,
+                    bool use_tt,
                     unsigned long p_size);
 
  /**
@@ -864,7 +870,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
   * Remove the generic range manager from a slot and tear it down.
   */
  int ttm_range_man_fini(struct ttm_bo_device *bdev,
-                    struct ttm_mem_type_manager *man);
+                    unsigned type);
 
Quoted 7 lines

include/drm/ttm/ttm_bo_driver.h int ttm_range_man_init(struct ttm_bo_device *bdev, · line 876

Quoted 2 lines
include/drm/ttm/ttm_bo_driver.h +0 -0
  /**
   * ttm_mem_type_manager_debug

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

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

author maintainer
#101 lore raw

PATCH 47/59 drm/ttm: move range manager to subclassed driver allocation

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 31 +++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_manager.c +19 -12
index d83cb967a107..01d41c6f2f7b 100644
@@ -44,16 +44,22 @@
  */
 
 struct ttm_range_manager {
+	struct ttm_mem_type_manager manager;
 	struct drm_mm mm;
 	spinlock_t lock;
 };
 
+static inline struct ttm_range_manager *to_range_manager(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct ttm_range_manager, manager);
+}
+
 static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,
 			       struct ttm_buffer_object *bo,
 			       const struct ttm_place *place,
 			       struct ttm_mem_reg *mem)
 {
-	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+	struct ttm_range_manager *rman = to_range_manager(man);
 	struct drm_mm *mm = &rman->mm;
 	struct drm_mm_node *node;
 	enum drm_mm_insert_mode mode;
@@ -92,7 +98,7 @@ static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,
 static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
 				struct ttm_mem_reg *mem)
 {
-	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+	struct ttm_range_manager *rman = to_range_manager(man);
 
 	if (mem->mm_node) {
 		spin_lock(&rman->lock);
@@ -113,25 +119,26 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 		       bool use_tt,
 		       unsigned long p_size)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
+	struct ttm_mem_type_manager *man;
 	struct ttm_range_manager *rman;
 
-	man->available_caching = available_caching;
-	man->default_caching = default_caching;
-	man->use_tt = use_tt;
-
 	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
 	if (!rman)
 		return -ENOMEM;
 
+	man = &rman->manager;
+	man->available_caching = available_caching;
+	man->default_caching = default_caching;
+	man->use_tt = use_tt;
+
 	man->func = &ttm_bo_manager_func;
 
 	ttm_mem_type_manager_init(bdev, man, p_size);
 
 	drm_mm_init(&rman->mm, 0, p_size);
 	spin_lock_init(&rman->lock);
-	man->priv = rman;
 
+	ttm_set_driver_manager(bdev, type, &rman->manager);
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -141,7 +148,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
 		       unsigned type)
 {
 	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
-	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+	struct ttm_range_manager *rman = to_range_manager(man);
 	struct drm_mm *mm = &rman->mm;
 	int ret;
 
@@ -155,10 +162,10 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
 	drm_mm_clean(mm);
 	drm_mm_takedown(mm);
 	spin_unlock(&rman->lock);
-	kfree(rman);
-	man->priv = NULL;
 
 	ttm_mem_type_manager_cleanup(man);
+	ttm_set_driver_manager(bdev, type, NULL);
+	kfree(rman);
 	return 0;
 }
 EXPORT_SYMBOL(ttm_range_man_fini);
@@ -166,7 +173,7 @@ EXPORT_SYMBOL(ttm_range_man_fini);
 static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
 			     struct drm_printer *printer)
 {
-	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+	struct ttm_range_manager *rman = to_range_manager(man);
 
 	spin_lock(&rman->lock);
 	drm_mm_print(&rman->mm, printer);
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 47/59
#102 lore raw

Re: [PATCH 47/59] drm/ttm: move range manager to subclassed driver allocation

Quoted 5 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 108 lines
---
 drivers/gpu/drm/ttm/ttm_bo_manager.c | 31 +++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_manager.c +19 -13
index d83cb967a107..01d41c6f2f7b 100644
@@ -44,16 +44,22 @@
  */
 
 struct ttm_range_manager {
+       struct ttm_mem_type_manager manager;
        struct drm_mm mm;
        spinlock_t lock;
 };
 
+static inline struct ttm_range_manager *to_range_manager(struct ttm_mem_type_manager *man)
+{
+       return container_of(man, struct ttm_range_manager, manager);
+}
+
 static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,
                               struct ttm_buffer_object *bo,
                               const struct ttm_place *place,
                               struct ttm_mem_reg *mem)
 {
-       struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+       struct ttm_range_manager *rman = to_range_manager(man);
        struct drm_mm *mm = &rman->mm;
        struct drm_mm_node *node;
        enum drm_mm_insert_mode mode;
@@ -92,7 +98,7 @@ static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,
 static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
                                struct ttm_mem_reg *mem)
 {
-       struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+       struct ttm_range_manager *rman = to_range_manager(man);
 
        if (mem->mm_node) {
                spin_lock(&rman->lock);
@@ -113,25 +119,26 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
                       bool use_tt,
                       unsigned long p_size)
 {
-       struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
+       struct ttm_mem_type_manager *man;
        struct ttm_range_manager *rman;
 
-       man->available_caching = available_caching;
-       man->default_caching = default_caching;
-       man->use_tt = use_tt;
-
        rman = kzalloc(sizeof(*rman), GFP_KERNEL);
        if (!rman)
                return -ENOMEM;
 
+       man = &rman->manager;
+       man->available_caching = available_caching;
+       man->default_caching = default_caching;
+       man->use_tt = use_tt;
+
        man->func = &ttm_bo_manager_func;
 
        ttm_mem_type_manager_init(bdev, man, p_size);
 
        drm_mm_init(&rman->mm, 0, p_size);
        spin_lock_init(&rman->lock);
-       man->priv = rman;
 
+       ttm_set_driver_manager(bdev, type, &rman->manager);
        ttm_mem_type_manager_set_used(man, true);
        return 0;
 }
@@ -141,7 +148,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
                       unsigned type)
 {
        struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
-       struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+       struct ttm_range_manager *rman = to_range_manager(man);
        struct drm_mm *mm = &rman->mm;
        int ret;
 
@@ -155,10 +162,10 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
        drm_mm_clean(mm);
        drm_mm_takedown(mm);
        spin_unlock(&rman->lock);
-       kfree(rman);
-       man->priv = NULL;
 
        ttm_mem_type_manager_cleanup(man);
+       ttm_set_driver_manager(bdev, type, NULL);
+       kfree(rman);
        return 0;
 }
 EXPORT_SYMBOL(ttm_range_man_fini);
@@ -166,7 +173,7 @@ EXPORT_SYMBOL(ttm_range_man_fini);
 static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
                             struct drm_printer *printer)
 {
-       struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
+       struct ttm_range_manager *rman = to_range_manager(man);
 
        spin_lock(&rman->lock);
        drm_mm_print(&rman->mm, printer);
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#103 lore raw

PATCH 48/59 drm/vmwgfx/ttm: move thp to driver managed

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 32 +++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +21 -11
index 720a24214c74..1cefd9c1e8ea 100644
@@ -16,10 +16,16 @@
  * @lock: Manager lock.
  */
 struct vmw_thp_manager {
+	struct ttm_mem_type_manager manager;
 	struct drm_mm mm;
 	spinlock_t lock;
 };
 
+static struct vmw_thp_manager *to_thp_manager(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct vmw_thp_manager, manager);
+}
+
 static int vmw_thp_insert_aligned(struct drm_mm *mm, struct drm_mm_node *node,
 				  unsigned long align_pages,
 				  const struct ttm_place *place,
@@ -43,7 +49,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
 			    const struct ttm_place *place,
 			    struct ttm_mem_reg *mem)
 {
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 	struct drm_mm *mm = &rman->mm;
 	struct drm_mm_node *node;
 	unsigned long align_pages;
@@ -103,7 +109,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
 static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 			     struct ttm_mem_reg *mem)
 {
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 
 	if (mem->mm_node) {
 		spin_lock(&rman->lock);
@@ -117,20 +123,24 @@ static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 
 int vmw_thp_init(struct vmw_private *dev_priv)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
+	struct ttm_mem_type_manager *man;
 	struct vmw_thp_manager *rman;
+
+	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
+	if (!rman)
+		return -ENOMEM;
+
+	man = &rman->manager;
 	man->available_caching = TTM_PL_FLAG_CACHED;
 	man->default_caching = TTM_PL_FLAG_CACHED;
 
 	ttm_mem_type_manager_init(&dev_priv->bdev, man,
 				  dev_priv->vram_size >> PAGE_SHIFT);
-	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
-	if (!rman)
-		return -ENOMEM;
 
 	drm_mm_init(&rman->mm, 0, man->size);
 	spin_lock_init(&rman->lock);
-	man->priv = rman;
+
+	ttm_set_driver_manager(&dev_priv->bdev, TTM_PL_VRAM, &rman->manager);
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -138,7 +148,7 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 void vmw_thp_fini(struct vmw_private *dev_priv)
 {
 	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 	struct drm_mm *mm = &rman->mm;
 	int ret;
 
@@ -151,15 +161,15 @@ void vmw_thp_fini(struct vmw_private *dev_priv)
 	drm_mm_clean(mm);
 	drm_mm_takedown(mm);
 	spin_unlock(&rman->lock);
-	kfree(rman);
-	man->priv = NULL;
 	ttm_mem_type_manager_cleanup(man);
+	ttm_set_driver_manager(&dev_priv->bdev, TTM_PL_VRAM, NULL);
+	kfree(rman);
 }
 
 static void vmw_thp_debug(struct ttm_mem_type_manager *man,
 			  struct drm_printer *printer)
 {
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 
 	spin_lock(&rman->lock);
 	drm_mm_print(&rman->mm, printer);
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 48/59
#104 lore raw

Re: [PATCH 48/59] drm/vmwgfx/ttm: move thp to driver managed

Quoted 3 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 108 lines
---
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 32 +++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +21 -11
index 720a24214c74..1cefd9c1e8ea 100644
@@ -16,10 +16,16 @@
  * @lock: Manager lock.
  */
 struct vmw_thp_manager {
+	struct ttm_mem_type_manager manager;
 	struct drm_mm mm;
 	spinlock_t lock;
 };
 
+static struct vmw_thp_manager *to_thp_manager(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct vmw_thp_manager, manager);
+}
+
 static int vmw_thp_insert_aligned(struct drm_mm *mm, struct drm_mm_node *node,
 				  unsigned long align_pages,
 				  const struct ttm_place *place,
@@ -43,7 +49,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
 			    const struct ttm_place *place,
 			    struct ttm_mem_reg *mem)
 {
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 	struct drm_mm *mm = &rman->mm;
 	struct drm_mm_node *node;
 	unsigned long align_pages;
@@ -103,7 +109,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man,
 static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 			     struct ttm_mem_reg *mem)
 {
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 
 	if (mem->mm_node) {
 		spin_lock(&rman->lock);
@@ -117,20 +123,24 @@ static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
 
 int vmw_thp_init(struct vmw_private *dev_priv)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
+	struct ttm_mem_type_manager *man;
 	struct vmw_thp_manager *rman;
+
+	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
+	if (!rman)
+		return -ENOMEM;
+
+	man = &rman->manager;
 	man->available_caching = TTM_PL_FLAG_CACHED;
 	man->default_caching = TTM_PL_FLAG_CACHED;
 
 	ttm_mem_type_manager_init(&dev_priv->bdev, man,
 				  dev_priv->vram_size >> PAGE_SHIFT);
-	rman = kzalloc(sizeof(*rman), GFP_KERNEL);
-	if (!rman)
-		return -ENOMEM;
 
 	drm_mm_init(&rman->mm, 0, man->size);
 	spin_lock_init(&rman->lock);
-	man->priv = rman;
+
+	ttm_set_driver_manager(&dev_priv->bdev, TTM_PL_VRAM, &rman->manager);
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -138,7 +148,7 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 void vmw_thp_fini(struct vmw_private *dev_priv)
 {
 	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM);
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 	struct drm_mm *mm = &rman->mm;
 	int ret;
 
@@ -151,15 +161,15 @@ void vmw_thp_fini(struct vmw_private *dev_priv)
 	drm_mm_clean(mm);
 	drm_mm_takedown(mm);
 	spin_unlock(&rman->lock);
-	kfree(rman);
-	man->priv = NULL;
 	ttm_mem_type_manager_cleanup(man);
+	ttm_set_driver_manager(&dev_priv->bdev, TTM_PL_VRAM, NULL);
+	kfree(rman);
 }
 
 static void vmw_thp_debug(struct ttm_mem_type_manager *man,
 			  struct drm_printer *printer)
 {
-	struct vmw_thp_manager *rman = (struct vmw_thp_manager *) man->priv;
+	struct vmw_thp_manager *rman = to_thp_manager(man);
 
 	spin_lock(&rman->lock);
 	drm_mm_print(&rman->mm, printer);
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#105 lore raw

PATCH 49/59 drm/vmwgfx/gmrid: convert to driver controlled allocation.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +18 -14
index 54c85a59dd8b..bc51b7773084 100644
@@ -37,6 +37,7 @@
 #include <linux/kernel.h>
 
 struct vmwgfx_gmrid_man {
+	struct ttm_mem_type_manager manager;
 	spinlock_t lock;
 	struct ida gmr_ida;
 	uint32_t max_gmr_ids;
@@ -44,13 +45,17 @@ struct vmwgfx_gmrid_man {
 	uint32_t used_gmr_pages;
 };
 
+static struct vmwgfx_gmrid_man *to_gmrid_manager(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct vmwgfx_gmrid_man, manager);
+}
+
 static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,
 				  struct ttm_buffer_object *bo,
 				  const struct ttm_place *place,
 				  struct ttm_mem_reg *mem)
 {
-	struct vmwgfx_gmrid_man *gman =
-		(struct vmwgfx_gmrid_man *)man->priv;
+	struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
 	int id;
 
 	id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);
@@ -82,8 +87,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,
 static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man,
 				   struct ttm_mem_reg *mem)
 {
-	struct vmwgfx_gmrid_man *gman =
-		(struct vmwgfx_gmrid_man *)man->priv;
+	struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
 
 	if (mem->mm_node) {
 		ida_free(&gman->gmr_ida, mem->start);
@@ -98,13 +102,15 @@ static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
 
 int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
+	struct ttm_mem_type_manager *man;
 	struct vmwgfx_gmrid_man *gman =
 		kzalloc(sizeof(*gman), GFP_KERNEL);
 
 	if (unlikely(!gman))
 		return -ENOMEM;
 
+	man = &gman->manager;
+
 	man->func = &vmw_gmrid_manager_func;
 	man->available_caching = TTM_PL_FLAG_CACHED;
 	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -127,8 +133,7 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 	default:
 		BUG();
 	}
-	man->priv = (void *) gman;
-
+	ttm_set_driver_manager(&dev_priv->bdev, type, &gman->manager);
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -136,19 +141,18 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)
 {
 	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
-	struct vmwgfx_gmrid_man *gman =
-		(struct vmwgfx_gmrid_man *)man->priv;
+	struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
 
 	ttm_mem_type_manager_disable(man);
 
 	ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
 
-	if (gman) {
-		ida_destroy(&gman->gmr_ida);
-		kfree(gman);
-	}
-
 	ttm_mem_type_manager_cleanup(man);
+
+	ttm_set_driver_manager(&dev_priv->bdev, type, NULL);
+	ida_destroy(&gman->gmr_ida);
+	kfree(gman);
+
 }
 
 static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by Daniel Vetter on v1 49/59
#106 lore raw

Re: [PATCH 49/59] drm/vmwgfx/gmrid: convert to driver controlled allocation.

Quoted 79 lines · Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +12 -7
index 54c85a59dd8b..bc51b7773084 100644
@@ -37,6 +37,7 @@
 #include <linux/kernel.h>
 
 struct vmwgfx_gmrid_man {
+	struct ttm_mem_type_manager manager;
 	spinlock_t lock;
 	struct ida gmr_ida;
 	uint32_t max_gmr_ids;
@@ -44,13 +45,17 @@ struct vmwgfx_gmrid_man {
 	uint32_t used_gmr_pages;
 };
 
+static struct vmwgfx_gmrid_man *to_gmrid_manager(struct ttm_mem_type_manager *man)
+{
+	return container_of(man, struct vmwgfx_gmrid_man, manager);
+}
+
 static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,
 				  struct ttm_buffer_object *bo,
 				  const struct ttm_place *place,
 				  struct ttm_mem_reg *mem)
 {
-	struct vmwgfx_gmrid_man *gman =
-		(struct vmwgfx_gmrid_man *)man->priv;
+	struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
 	int id;
 
 	id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);
@@ -82,8 +87,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,
 static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man,
 				   struct ttm_mem_reg *mem)
 {
-	struct vmwgfx_gmrid_man *gman =
-		(struct vmwgfx_gmrid_man *)man->priv;
+	struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
 
 	if (mem->mm_node) {
 		ida_free(&gman->gmr_ida, mem->start);
@@ -98,13 +102,15 @@ static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func;
 
 int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
+	struct ttm_mem_type_manager *man;
 	struct vmwgfx_gmrid_man *gman =
 		kzalloc(sizeof(*gman), GFP_KERNEL);
 
 	if (unlikely(!gman))
 		return -ENOMEM;
 
+	man = &gman->manager;
+
 	man->func = &vmw_gmrid_manager_func;
 	man->available_caching = TTM_PL_FLAG_CACHED;
 	man->default_caching = TTM_PL_FLAG_CACHED;
@@ -127,8 +133,7 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 	default:
 		BUG();
 	}
-	man->priv = (void *) gman;
-
+	ttm_set_driver_manager(&dev_priv->bdev, type, &gman->manager);
 	ttm_mem_type_manager_set_used(man, true);
 	return 0;
 }
@@ -136,19 +141,18 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type)
 {

drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type) · line 146

Quoted 10 lines
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1 -3
 	struct ttm_mem_type_manager *man = ttm_manager_type(&dev_priv->bdev, type);
-	struct vmwgfx_gmrid_man *gman =
-		(struct vmwgfx_gmrid_man *)man->priv;
+	struct vmwgfx_gmrid_man *gman = to_gmrid_manager(man);
 
 	ttm_mem_type_manager_disable(man);
 
 	ttm_mem_type_manager_force_list_clean(&dev_priv->bdev, man);
 
-	if (gman) {

Ah, here it goes, please disregard my suggestion earlier for adding a WARN_ON, that's just churn.

Quoted 20 lines
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +5 -4
-		ida_destroy(&gman->gmr_ida);
-		kfree(gman);
-	}
-
 	ttm_mem_type_manager_cleanup(man);
+
+	ttm_set_driver_manager(&dev_priv->bdev, type, NULL);
+	ida_destroy(&gman->gmr_ida);
+	kfree(gman);
+
 }
 
 static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#107 lore raw

PATCH 50/59 drm/nouveau/ttm: move to driver allocated manager

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 45 +++++++++++++++++++--------
 1 file changed, 32 insertions(+), 13 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +32 -13
index 1c636723823c..58d9bd708e95 100644
@@ -157,12 +157,12 @@ static int
 nouveau_ttm_init_vram(struct nouveau_drm *drm)
 {
 	struct nvif_mmu *mmu = &drm->client.mmu;
-
 	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
-		struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
-
 		/* Some BARs do not support being ioremapped WC */
 		const u8 type = mmu->type[drm->ttm.type_vram].type;
+		struct ttm_mem_type_manager *man = kzalloc(sizeof(struct ttm_mem_type_manager), GFP_KERNEL);
+		if (!man)
+			return -ENOMEM;
 
 		man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
 		man->default_caching = TTM_PL_FLAG_WC;
@@ -174,8 +174,10 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 
 		man->func = &nouveau_vram_manager;
 		man->use_io_reserve_lru = true;
+
 		ttm_mem_type_manager_init(&drm->ttm.bdev, man,
 					  drm->gem.vram_available >> PAGE_SHIFT);
+		ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man);
 		ttm_mem_type_manager_set_used(man, true);
 		return 0;
 	} else {
@@ -195,6 +197,8 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 		ttm_mem_type_manager_disable(man);
 		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
 		ttm_mem_type_manager_cleanup(man);
+		ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, NULL);
+		kfree(man);
 	} else
 		ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_VRAM);
 }
@@ -202,30 +206,43 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
+	struct ttm_mem_type_manager *man;
 	unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
-	man->use_tt = true;
+	unsigned available_caching, default_caching;
+	const struct ttm_mem_type_manager_func *func = NULL;
 	if (drm->agp.bridge) {
-		man->available_caching = TTM_PL_FLAG_UNCACHED |
+		available_caching = TTM_PL_FLAG_UNCACHED |
 			TTM_PL_FLAG_WC;
-		man->default_caching = TTM_PL_FLAG_WC;
+		default_caching = TTM_PL_FLAG_WC;
 	} else {
-		man->available_caching = TTM_PL_MASK_CACHING;
-		man->default_caching = TTM_PL_FLAG_CACHED;
+		available_caching = TTM_PL_MASK_CACHING;
+		default_caching = TTM_PL_FLAG_CACHED;
 	}
 
 	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
-		man->func = &nouveau_gart_manager;
+		func = &nouveau_gart_manager;
 	else if (!drm->agp.bridge)
-		man->func = &nv04_gart_manager;
+		func = &nv04_gart_manager;
 	else
 		return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT,
-					  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
-					  TTM_PL_FLAG_WC, true,
+					  available_caching, default_caching,
+					  true,
 					  size_pages);
+
+	man = kzalloc(sizeof(struct ttm_mem_type_manager), GFP_KERNEL);
+	if (!man)
+		return -ENOMEM;
+
+	man->func = func;
+	man->available_caching = available_caching;
+	man->default_caching = default_caching;
+	man->use_tt = true;
 	ttm_mem_type_manager_init(&drm->ttm.bdev, man,
 				  size_pages);
+
+	ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);
 	ttm_mem_type_manager_set_used(man, true);
+
 	return 0;
 }
 
@@ -241,6 +258,8 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
 		ttm_mem_type_manager_disable(man);
 		ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
 		ttm_mem_type_manager_cleanup(man);
+		ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, NULL);
+		kfree(man);
 	}
 }
 
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 50/59
#108 lore raw

Re: [PATCH 50/59] drm/nouveau/ttm: move to driver allocated manager

Quoted 4 lines · Dave Airlie

From: Dave Airlie <[email protected]>

Quoted 110 lines
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 45 +++++++++++++++++++--------
 1 file changed, 32 insertions(+), 13 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +32 -14
index 1c636723823c..58d9bd708e95 100644
@@ -157,12 +157,12 @@ static int
 nouveau_ttm_init_vram(struct nouveau_drm *drm)
 {
        struct nvif_mmu *mmu = &drm->client.mmu;
-
        if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
-               struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
-
                /* Some BARs do not support being ioremapped WC */
                const u8 type = mmu->type[drm->ttm.type_vram].type;
+               struct ttm_mem_type_manager *man = kzalloc(sizeof(struct ttm_mem_type_manager), GFP_KERNEL);
+               if (!man)
+                       return -ENOMEM;
 
                man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
                man->default_caching = TTM_PL_FLAG_WC;
@@ -174,8 +174,10 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 
                man->func = &nouveau_vram_manager;
                man->use_io_reserve_lru = true;
+
                ttm_mem_type_manager_init(&drm->ttm.bdev, man,
                                          drm->gem.vram_available >> PAGE_SHIFT);
+               ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man);
                ttm_mem_type_manager_set_used(man, true);
                return 0;
        } else {
@@ -195,6 +197,8 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
                ttm_mem_type_manager_disable(man);
                ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
                ttm_mem_type_manager_cleanup(man);
+               ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, NULL);
+               kfree(man);
        } else
                ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_VRAM);
 }
@@ -202,30 +206,43 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
+       struct ttm_mem_type_manager *man;
        unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
-       man->use_tt = true;
+       unsigned available_caching, default_caching;
+       const struct ttm_mem_type_manager_func *func = NULL;
        if (drm->agp.bridge) {
-               man->available_caching = TTM_PL_FLAG_UNCACHED |
+               available_caching = TTM_PL_FLAG_UNCACHED |
                        TTM_PL_FLAG_WC;
-               man->default_caching = TTM_PL_FLAG_WC;
+               default_caching = TTM_PL_FLAG_WC;
        } else {
-               man->available_caching = TTM_PL_MASK_CACHING;
-               man->default_caching = TTM_PL_FLAG_CACHED;
+               available_caching = TTM_PL_MASK_CACHING;
+               default_caching = TTM_PL_FLAG_CACHED;
        }
 
        if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
-               man->func = &nouveau_gart_manager;
+               func = &nouveau_gart_manager;
        else if (!drm->agp.bridge)
-               man->func = &nv04_gart_manager;
+               func = &nv04_gart_manager;
        else
                return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT,
-                                         TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
-                                         TTM_PL_FLAG_WC, true,
+                                         available_caching, default_caching,
+                                         true,
                                          size_pages);
+
+       man = kzalloc(sizeof(struct ttm_mem_type_manager), GFP_KERNEL);
+       if (!man)
+               return -ENOMEM;
+
+       man->func = func;
+       man->available_caching = available_caching;
+       man->default_caching = default_caching;
+       man->use_tt = true;
        ttm_mem_type_manager_init(&drm->ttm.bdev, man,
                                  size_pages);
+
+       ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);
        ttm_mem_type_manager_set_used(man, true);
+
        return 0;
 }
 
@@ -241,6 +258,8 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
                ttm_mem_type_manager_disable(man);
                ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
                ttm_mem_type_manager_cleanup(man);
+               ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, NULL);
+               kfree(man);
        }
 }
 
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#109 lore raw

PATCH 51/59 drm/ttm: drop priv pointer in memory manager

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This isn't needed anymore by any drivers.

---
 include/drm/ttm/ttm_bo_driver.h | 2 --
 1 file changed, 2 deletions(-)
include/drm/ttm/ttm_bo_driver.h +0 -2
index 789c1eb26859..b477c1ad5c3e 100644
@@ -123,7 +123,6 @@ struct ttm_mem_type_manager_func {
  * @default_caching: The default caching policy used for a buffer object
  * placed in this memory type if the user doesn't provide one.
  * @func: structure pointer implementing the range manager. See above
- * @priv: Driver private closure for @func.
  * @io_reserve_mutex: Mutex optionally protecting shared io_reserve structures
  * @use_io_reserve_lru: Use an lru list to try to unreserve io_mem_regions
  * reserved by the TTM vm system.
@@ -152,7 +151,6 @@ struct ttm_mem_type_manager {
 	uint32_t available_caching;
 	uint32_t default_caching;
 	const struct ttm_mem_type_manager_func *func;
-	void *priv;
 	struct mutex io_reserve_mutex;
 	bool use_io_reserve_lru;
 	spinlock_t move_lock;
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 51/59
#110 lore raw

Re: [PATCH 51/59] drm/ttm: drop priv pointer in memory manager

Quoted 7 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This isn't needed anymore by any drivers.

Quoted 27 lines
---
 include/drm/ttm/ttm_bo_driver.h | 2 --
 1 file changed, 2 deletions(-)
include/drm/ttm/ttm_bo_driver.h +0 -3
index 789c1eb26859..b477c1ad5c3e 100644
@@ -123,7 +123,6 @@ struct ttm_mem_type_manager_func {
  * @default_caching: The default caching policy used for a buffer object
  * placed in this memory type if the user doesn't provide one.
  * @func: structure pointer implementing the range manager. See above
- * @priv: Driver private closure for @func.
  * @io_reserve_mutex: Mutex optionally protecting shared io_reserve structures
  * @use_io_reserve_lru: Use an lru list to try to unreserve io_mem_regions
  * reserved by the TTM vm system.
@@ -152,7 +151,6 @@ struct ttm_mem_type_manager {
        uint32_t available_caching;
        uint32_t default_caching;
        const struct ttm_mem_type_manager_func *func;
-       void *priv;
        struct mutex io_reserve_mutex;
        bool use_io_reserve_lru;
        spinlock_t move_lock;
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#111 lore raw

PATCH 52/59 drm/amdgpu/ttm: remove man->bdev references.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

Just store the device in the private so the link
can be removed from the manager

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +5 -2
index 2b37f4266dcb..bbc528c0ed3e 100644
@@ -34,6 +34,7 @@ struct amdgpu_vram_mgr {
 	spinlock_t lock;
 	atomic64_t usage;
 	atomic64_t vis_usage;
+	struct amdgpu_device *adev;
 };
 
 static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_mem_type_manager *man)
@@ -196,6 +197,8 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
 	drm_mm_init(&mgr->mm, 0, man->size);
 	spin_lock_init(&mgr->lock);
 
+	mgr->adev = adev;
+
 	/* Add the two VRAM-related sysfs files */
 	ret = sysfs_create_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes);
 	if (ret)
@@ -323,8 +326,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
 			       const struct ttm_place *place,
 			       struct ttm_mem_reg *mem)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
 	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
+	struct amdgpu_device *adev = mgr->adev;
 	struct drm_mm *mm = &mgr->mm;
 	struct drm_mm_node *nodes;
 	enum drm_mm_insert_mode mode;
@@ -439,8 +442,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
 static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man,
 				struct ttm_mem_reg *mem)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
 	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man);
+	struct amdgpu_device *adev = mgr->adev;
 	struct drm_mm_node *nodes = mem->mm_node;
 	uint64_t usage = 0, vis_usage = 0;
 	unsigned pages = mem->num_pages;
Signature · 6 lines
2.26.2

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

PATCH 53/59 drm/ttm: drop man->bdev link.

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

This link isn't needed anymore, drop it from the init interface.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c   | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 2 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c         | 6 ++----
 drivers/gpu/drm/ttm/ttm_bo.c                  | 6 ++----
 drivers/gpu/drm/ttm/ttm_bo_manager.c          | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c           | 2 +-
 include/drm/ttm/ttm_bo_api.h                  | 6 ++----
 include/drm/ttm/ttm_bo_driver.h               | 2 --
 9 files changed, 11 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +1 -1
index b664c5cb13ce..9fc3d876ed38 100644
@@ -108,7 +108,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 	man->available_caching = TTM_PL_MASK_CACHING;
 	man->default_caching = TTM_PL_FLAG_CACHED;
 
-	ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
+	ttm_mem_type_manager_init(man, gtt_size >> PAGE_SHIFT);
 
 	start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
 	size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -1
index bbc528c0ed3e..684698cdf772 100644
@@ -190,7 +190,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
 	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
 	man->default_caching = TTM_PL_FLAG_WC;
 
-	ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
+	ttm_mem_type_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);
 
 	man->func = &amdgpu_vram_mgr_func;
 
drivers/gpu/drm/nouveau/nouveau_ttm.c +2 -4
index 58d9bd708e95..d408e1485cce 100644
@@ -175,7 +175,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 		man->func = &nouveau_vram_manager;
 		man->use_io_reserve_lru = true;
 
-		ttm_mem_type_manager_init(&drm->ttm.bdev, man,
+		ttm_mem_type_manager_init(man,
 					  drm->gem.vram_available >> PAGE_SHIFT);
 		ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man);
 		ttm_mem_type_manager_set_used(man, true);
@@ -237,9 +237,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 	man->available_caching = available_caching;
 	man->default_caching = default_caching;
 	man->use_tt = true;
-	ttm_mem_type_manager_init(&drm->ttm.bdev, man,
-				  size_pages);
-
+	ttm_mem_type_manager_init(man, size_pages);
 	ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);
 	ttm_mem_type_manager_set_used(man, true);
 
drivers/gpu/drm/ttm/ttm_bo.c +2 -4
index 3a3a4dfb0fff..78b72443a9ef 100644
@@ -1471,8 +1471,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);
 
-void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
-			       struct ttm_mem_type_manager *man,
+void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
 			       unsigned long p_size)
 {
 	unsigned i;
@@ -1482,7 +1481,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
 	mutex_init(&man->io_reserve_mutex);
 	spin_lock_init(&man->move_lock);
 	INIT_LIST_HEAD(&man->io_reserve_lru);
-	man->bdev = bdev;
 	man->size = p_size;
 
 	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
@@ -1595,7 +1593,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
 	man->available_caching = TTM_PL_MASK_CACHING;
 	man->default_caching = TTM_PL_FLAG_CACHED;
 
-	ttm_mem_type_manager_init(bdev, man, 0);
+	ttm_mem_type_manager_init(man, 0);
 	ttm_mem_type_manager_set_used(man, true);
 }
 
drivers/gpu/drm/ttm/ttm_bo_manager.c +1 -1
index 01d41c6f2f7b..1b7245ce3356 100644
@@ -133,7 +133,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 
 	man->func = &ttm_bo_manager_func;
 
-	ttm_mem_type_manager_init(bdev, man, p_size);
+	ttm_mem_type_manager_init(man, p_size);
 
 	drm_mm_init(&rman->mm, 0, p_size);
 	spin_lock_init(&rman->lock);
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1 -1
index bc51b7773084..c3fa25161fd0 100644
@@ -116,7 +116,7 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 	man->default_caching = TTM_PL_FLAG_CACHED;
 	/* TODO: This is most likely not correct */
 	man->use_tt = true;
-	ttm_mem_type_manager_init(&dev_priv->bdev, man, 0);
+	ttm_mem_type_manager_init(man, 0);
 	spin_lock_init(&gman->lock);
 	gman->used_gmr_pages = 0;
 	ida_init(&gman->gmr_ida);
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +1 -1
index 1cefd9c1e8ea..0b9c29249393 100644
@@ -134,7 +134,7 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 	man->available_caching = TTM_PL_FLAG_CACHED;
 	man->default_caching = TTM_PL_FLAG_CACHED;
 
-	ttm_mem_type_manager_init(&dev_priv->bdev, man,
+	ttm_mem_type_manager_init(man,
 				  dev_priv->vram_size >> PAGE_SHIFT);
 
 	drm_mm_init(&rman->mm, 0, man->size);
include/drm/ttm/ttm_bo_api.h +2 -4
index 9c55eafd0e7d..eb465e9ca0c1 100644
@@ -536,14 +536,12 @@ int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size,
 /**
  * ttm_mem_type_manager_init
  *
- * @bdev: Pointer to a ttm_bo_device struct.
  * @man: memory manager object to init
  * @p_size: size managed area in pages.
  *
- * Initialise core parts of a a manager object.
+ * Initialise core parts of a manager object.
  */
-void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
-			       struct ttm_mem_type_manager *man,
+void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
 			       unsigned long p_size);
 
 /**
include/drm/ttm/ttm_bo_driver.h +0 -2
index b477c1ad5c3e..bfd19400372f 100644
@@ -138,8 +138,6 @@ struct ttm_mem_type_manager_func {
 
 
 struct ttm_mem_type_manager {
-	struct ttm_bo_device *bdev;
-
 	/*
 	 * No protection. Constant from start.
 	 */
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 53/59
#113 lore raw

Re: [PATCH 53/59] drm/ttm: drop man->bdev link.

Quoted 6 lines · Dave Airlie

From: Dave Airlie <[email protected]>

This link isn't needed anymore, drop it from the init interface.

Quoted 169 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c   | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 2 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c         | 6 ++----
 drivers/gpu/drm/ttm/ttm_bo.c                  | 6 ++----
 drivers/gpu/drm/ttm/ttm_bo_manager.c          | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c           | 2 +-
 include/drm/ttm/ttm_bo_api.h                  | 6 ++----
 include/drm/ttm/ttm_bo_driver.h               | 2 --
 9 files changed, 11 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +1 -1
index b664c5cb13ce..9fc3d876ed38 100644
@@ -108,7 +108,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
        man->available_caching = TTM_PL_MASK_CACHING;
        man->default_caching = TTM_PL_FLAG_CACHED;
 
-       ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
+       ttm_mem_type_manager_init(man, gtt_size >> PAGE_SHIFT);
 
        start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
        size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -1
index bbc528c0ed3e..684698cdf772 100644
@@ -190,7 +190,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
        man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
        man->default_caching = TTM_PL_FLAG_WC;
 
-       ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
+       ttm_mem_type_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);
 
        man->func = &amdgpu_vram_mgr_func;
 
drivers/gpu/drm/nouveau/nouveau_ttm.c +2 -4
index 58d9bd708e95..d408e1485cce 100644
@@ -175,7 +175,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
                man->func = &nouveau_vram_manager;
                man->use_io_reserve_lru = true;
 
-               ttm_mem_type_manager_init(&drm->ttm.bdev, man,
+               ttm_mem_type_manager_init(man,
                                          drm->gem.vram_available >> PAGE_SHIFT);
                ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man);
                ttm_mem_type_manager_set_used(man, true);
@@ -237,9 +237,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
        man->available_caching = available_caching;
        man->default_caching = default_caching;
        man->use_tt = true;
-       ttm_mem_type_manager_init(&drm->ttm.bdev, man,
-                                 size_pages);
-
+       ttm_mem_type_manager_init(man, size_pages);
        ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);
        ttm_mem_type_manager_set_used(man, true);
 
drivers/gpu/drm/ttm/ttm_bo.c +2 -4
index 3a3a4dfb0fff..78b72443a9ef 100644
@@ -1471,8 +1471,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);
 
-void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
-                              struct ttm_mem_type_manager *man,
+void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
                               unsigned long p_size)
 {
        unsigned i;
@@ -1482,7 +1481,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
        mutex_init(&man->io_reserve_mutex);
        spin_lock_init(&man->move_lock);
        INIT_LIST_HEAD(&man->io_reserve_lru);
-       man->bdev = bdev;
        man->size = p_size;
 
        for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
@@ -1595,7 +1593,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
        man->available_caching = TTM_PL_MASK_CACHING;
        man->default_caching = TTM_PL_FLAG_CACHED;
 
-       ttm_mem_type_manager_init(bdev, man, 0);
+       ttm_mem_type_manager_init(man, 0);
        ttm_mem_type_manager_set_used(man, true);
 }
 
drivers/gpu/drm/ttm/ttm_bo_manager.c +1 -1
index 01d41c6f2f7b..1b7245ce3356 100644
@@ -133,7 +133,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 
        man->func = &ttm_bo_manager_func;
 
-       ttm_mem_type_manager_init(bdev, man, p_size);
+       ttm_mem_type_manager_init(man, p_size);
 
        drm_mm_init(&rman->mm, 0, p_size);
        spin_lock_init(&rman->lock);
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1 -1
index bc51b7773084..c3fa25161fd0 100644
@@ -116,7 +116,7 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
        man->default_caching = TTM_PL_FLAG_CACHED;
        /* TODO: This is most likely not correct */
        man->use_tt = true;
-       ttm_mem_type_manager_init(&dev_priv->bdev, man, 0);
+       ttm_mem_type_manager_init(man, 0);
        spin_lock_init(&gman->lock);
        gman->used_gmr_pages = 0;
        ida_init(&gman->gmr_ida);
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +1 -1
index 1cefd9c1e8ea..0b9c29249393 100644
@@ -134,7 +134,7 @@ int vmw_thp_init(struct vmw_private *dev_priv)
        man->available_caching = TTM_PL_FLAG_CACHED;
        man->default_caching = TTM_PL_FLAG_CACHED;
 
-       ttm_mem_type_manager_init(&dev_priv->bdev, man,
+       ttm_mem_type_manager_init(man,
                                  dev_priv->vram_size >> PAGE_SHIFT);
 
        drm_mm_init(&rman->mm, 0, man->size);
include/drm/ttm/ttm_bo_api.h +2 -4
index 9c55eafd0e7d..eb465e9ca0c1 100644
@@ -536,14 +536,12 @@ int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size,
 /**
  * ttm_mem_type_manager_init
  *
- * @bdev: Pointer to a ttm_bo_device struct.
  * @man: memory manager object to init
  * @p_size: size managed area in pages.
  *
- * Initialise core parts of a a manager object.
+ * Initialise core parts of a manager object.
  */
-void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
-                              struct ttm_mem_type_manager *man,
+void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
                               unsigned long p_size);
 
 /**
include/drm/ttm/ttm_bo_driver.h +0 -3
index b477c1ad5c3e..bfd19400372f 100644
@@ -138,8 +138,6 @@ struct ttm_mem_type_manager_func {
 
 
 struct ttm_mem_type_manager {
-       struct ttm_bo_device *bdev;
-
        /*
         * No protection. Constant from start.
         */
--

2.26.2

Quoted 4 lines

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

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

author maintainer
#114 lore raw

PATCH 54/59 drm/ttm: drop list of memory managers from device. (v2)

In reply to Dave Airlie

From: Dave Airlie <[email protected]>

The driver now controls these, the core just controls the system memory one.

v2: init sysman explicitly and assign it as a driver manager to simplify the lookup sequence.

---
 drivers/gpu/drm/ttm/ttm_bo.c    | 6 +++---
 include/drm/ttm/ttm_bo_driver.h | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +3 -3
index 78b72443a9ef..12abe46bfbc1 100644
@@ -1558,6 +1558,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 
 	man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
 	ttm_mem_type_manager_disable(man);
+	ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, NULL);
 
 	mutex_lock(&ttm_global_mutex);
 	list_del(&bdev->device_list);
@@ -1583,7 +1584,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
 
 static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
 {
-	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
+	struct ttm_mem_type_manager *man = &bdev->sysman;
 
 	/*
 	 * Initialize the system memory buffer type.
@@ -1594,6 +1595,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
 	man->default_caching = TTM_PL_FLAG_CACHED;
 
 	ttm_mem_type_manager_init(man, 0);
+	ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, man);
 	ttm_mem_type_manager_set_used(man, true);
 }
 
@@ -1615,8 +1617,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
 	bdev->driver = driver;
 
-	memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
-
 	ttm_bo_init_sysman(bdev);
 
 	bdev->vma_manager = vma_manager;
include/drm/ttm/ttm_bo_driver.h +2 -4
index bfd19400372f..d5646d7cac60 100644
@@ -414,7 +414,7 @@ struct ttm_bo_device {
 	/*
 	 * access via ttm_manager_type.
 	 */
-	struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
+	struct ttm_mem_type_manager sysman;
 	struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
 	/*
 	 * Protected by internal locks.
@@ -446,9 +446,7 @@ struct ttm_bo_device {
 static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
 							    int mem_type)
 {
-	if (bdev->man_drv[mem_type])
-		return bdev->man_drv[mem_type];
-	return &bdev->man_priv[mem_type];
+	return bdev->man_drv[mem_type];
 }
 
 static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer Reviewed-by on v1 54/59
#115 lore raw

Re: [PATCH 54/59] drm/ttm: drop list of memory managers from device. (v2)

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 9 lines

From: Dave Airlie <[email protected]>

The driver now controls these, the core just controls the system memory one.

v2: init sysman explicitly and assign it as a driver manager to simplify the lookup sequence.

Quoted 57 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    | 6 +++---
  include/drm/ttm/ttm_bo_driver.h | 6 ++----
  2 files changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +3 -3
index 78b72443a9ef..12abe46bfbc1 100644
@@ -1558,6 +1558,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 
  	man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
  	ttm_mem_type_manager_disable(man);
+	ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, NULL);
 
  	mutex_lock(&ttm_global_mutex);
  	list_del(&bdev->device_list);
@@ -1583,7 +1584,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
 
  static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
  {
-	struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
+	struct ttm_mem_type_manager *man = &bdev->sysman;
 
  	/*
  	 * Initialize the system memory buffer type.
@@ -1594,6 +1595,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
  	man->default_caching = TTM_PL_FLAG_CACHED;
 
  	ttm_mem_type_manager_init(man, 0);
+	ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, man);
  	ttm_mem_type_manager_set_used(man, true);
  }
 
@@ -1615,8 +1617,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
  	bdev->driver = driver;
 
-	memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
-
  	ttm_bo_init_sysman(bdev);
 
  	bdev->vma_manager = vma_manager;
include/drm/ttm/ttm_bo_driver.h +1 -1
index bfd19400372f..d5646d7cac60 100644
@@ -414,7 +414,7 @@ struct ttm_bo_device {
  	/*
  	 * access via ttm_manager_type.
  	 */
-	struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
+	struct ttm_mem_type_manager sysman;
  	struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
  	/*
  	 * Protected by internal locks.

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 452

Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +1 -3
@@ -446,9 +446,7 @@ struct ttm_bo_device {
  static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
  							    int mem_type)
  {
-	if (bdev->man_drv[mem_type])
-		return bdev->man_drv[mem_type];
-	return &bdev->man_priv[mem_type];
+	return bdev->man_drv[mem_type];
  }
 
  static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,

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

Reviewed-by
#116 lore raw

Re: [PATCH 54/59] drm/ttm: drop list of memory managers from device. (v2)

Quoted 7 lines · Christian König

Am 04.08.20 um 04:56 schrieb Dave Airlie:

Quoted 5 lines

From: Dave Airlie <[email protected]>

The driver now controls these, the core just controls the system memory one.

Quoted 6 lines
Quoted 4 lines

v2: init sysman explicitly and assign it as a driver manager to simplify the lookup sequence.

Quoted 67 lines
Quoted 67 lines
---
  drivers/gpu/drm/ttm/ttm_bo.c    | 6 +++---
  include/drm/ttm/ttm_bo_driver.h | 6 ++----
  2 files changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +3 -3
index 78b72443a9ef..12abe46bfbc1 100644
@@ -1558,6 +1558,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
 
      man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
      ttm_mem_type_manager_disable(man);
+     ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, NULL);
 
      mutex_lock(&ttm_global_mutex);
      list_del(&bdev->device_list);
@@ -1583,7 +1584,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
 
  static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
  {
-     struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
+     struct ttm_mem_type_manager *man = &bdev->sysman;
 
      /*
       * Initialize the system memory buffer type.
@@ -1594,6 +1595,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
      man->default_caching = TTM_PL_FLAG_CACHED;
 
      ttm_mem_type_manager_init(man, 0);
+     ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, man);
      ttm_mem_type_manager_set_used(man, true);
  }
 
@@ -1615,8 +1617,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 
      bdev->driver = driver;
 
-     memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
-
      ttm_bo_init_sysman(bdev);
 
      bdev->vma_manager = vma_manager;
include/drm/ttm/ttm_bo_driver.h +2 -4
index bfd19400372f..d5646d7cac60 100644
@@ -414,7 +414,7 @@ struct ttm_bo_device {
      /*
       * access via ttm_manager_type.
       */
-     struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
+     struct ttm_mem_type_manager sysman;
      struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
      /*
       * Protected by internal locks.
@@ -446,9 +446,7 @@ struct ttm_bo_device {
  static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
                                                          int mem_type)
  {
-     if (bdev->man_drv[mem_type])
-             return bdev->man_drv[mem_type];
-     return &bdev->man_priv[mem_type];
+     return bdev->man_drv[mem_type];
  }
 
Quoted 6 lines

include/drm/ttm/ttm_bo_driver.h struct ttm_bo_device { · line 452

Quoted 1 line
include/drm/ttm/ttm_bo_driver.h +0 -0
  static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,

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

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