On Tue, Aug 04, 2020 at 12:55:34PM +1000, Dave Airlie wrote:

From: Dave Airlie airlied@redhat.com

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

Signed-off-by: Dave Airlie airlied@redhat.com

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(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 3596f3923ea3..b7c763713b4c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -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); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c index e8eb42933ca2..7f95ed6aa224 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_mob.c @@ -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);

}

/** diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index 2deaaed334e6..8e2a82ded900 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -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;

+}

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

-- 2.26.2

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Aug 04, 2020 at 12:55:35PM +1000, Dave Airlie wrote:

From: Dave Airlie airlied@redhat.com

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

Signed-off-by: Dave Airlie airlied@redhat.com

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 - drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 46 +++------------------- 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index b7c763713b4c..65c414f119c0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -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, diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index 8e2a82ded900..3a141a08d4bd 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -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

@@ -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.

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

• 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);

-- 2.26.2

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, 4 Aug 2020 at 12:57, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

Instead of rolling driver copies of them.

v2: cleanup return handling (Ben) Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

drivers/gpu/drm/nouveau/nouveau_bo.c | 38 ++-------------------------- 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 356c1aae327d..aebec45b8416 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

Am 04.08.20 um 04:55 schrieb Dave Airlie:

From: Dave Airlie airlied@redhat.com

Drop the WARN_ON and consolidate the two paths into one.

Use the consolidate slowpath in the execbuf utils code.

Signed-off-by: Dave Airlie airlied@redhat.com

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

---

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(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index afa5189dba7d..e01e8903741e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -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);

diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index 1797f04c0534..8a8f1a6a83a6 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c @@ -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);
  

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 09211ecbf84f..c20fef4da1d3 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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,
  

• 					   ticket);
  

• if (ret == -EINTR)
  

• 	ret = -ERESTARTSYS;
  

• return ret;
  

• }

• dma_resv_lock_slow(bo->base.resv, ticket);

• return 0; }

  /**

Am 04.08.20 um 04:55 schrieb Dave Airlie:

From: Dave Airlie airlied@redhat.com

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

Signed-off-by: Dave Airlie airlied@redhat.com

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

---

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(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 721ff546bf47..2b49037231eb 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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; }

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index d7a6537dd6ee..468a0eb9e632 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -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); }

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index c20fef4da1d3..7958e411269a 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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); }

On Tue, 4 Aug 2020 at 20:35, Christian König christian.koenig@amd.com wrote:

Am 04.08.20 um 04:55 schrieb Dave Airlie:

...

From: Dave Airlie airlied@redhat.com

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.)

Signed-off-by: Dave Airlie airlied@redhat.com

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

Reviewed-by: Ben Skeggs bskeggs@redhat.com

...

---

drivers/gpu/drm/ttm/ttm_bo.c | 13 +++++++------ include/drm/ttm/ttm_bo_driver.h | 8 ++++++++ 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 2b49037231eb..2ac70ec1f37d 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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);
  }
  

  }

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 7958e411269a..73f5d9c766cc 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, 4 Aug 2020 at 12:57, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

Acked-by: Christian König christian.koenig@amd.com Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

drivers/gpu/drm/nouveau/nouveau_ttm.c | 9 --------- 1 file changed, 9 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index b0012021ae12..6de762a0c229 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

Am 04.08.20 um 04:55 schrieb Dave Airlie:

From: Dave Airlie airlied@redhat.com

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)

Signed-off-by: Dave Airlie airlied@redhat.com

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

---

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(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 2ac70ec1f37d..300bcc10696a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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);

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index a9e13b252820..89053e761a69 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -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

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 73f5d9c766cc..6b49c0356343 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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
  */

Am 04.08.20 um 04:55 schrieb Dave Airlie:

From: Dave Airlie airlied@redhat.com

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)

Signed-off-by: Dave Airlie airlied@redhat.com

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(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 2ac70ec1f37d..300bcc10696a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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);

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index a9e13b252820..89053e761a69 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -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.
• */

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

Christian.

+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

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 73f5d9c766cc..6b49c0356343 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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
  */

On Tue, 4 Aug 2020 at 12:57, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

drivers/gpu/drm/nouveau/nouveau_ttm.c | 43 ++++++++++++--------------- 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 6de762a0c229..cfcbecd332ef 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Aug 04, 2020 at 12:55:53PM +1000, Dave Airlie wrote:

From: Dave Airlie airlied@redhat.com

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

Signed-off-by: Dave Airlie airlied@redhat.com

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(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 1e4c2c6119c3..5a889df2de03 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -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

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

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

• 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

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 65c414f119c0..10b681725a53 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -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

/** diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c index b7c816ba7166..0292c931c265 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c @@ -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,

-- 2.26.2

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Aug 04, 2020 at 12:55:54PM +1000, Dave Airlie wrote:

From: Dave Airlie airlied@redhat.com

Signed-off-by: Dave Airlie airlied@redhat.com

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(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 5a889df2de03..364d5f3ff9a8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -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;
  

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 10b681725a53..8f319dd6cdb4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -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

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c index fb1bf4dd91d1..141fb14e3583 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c @@ -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,

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

-- 2.26.2

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, 4 Aug 2020 at 12:57, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

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

Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

drivers/gpu/drm/ttm/ttm_bo.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 300bcc10696a..c56cbc6c0ba8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, 4 Aug 2020 at 12:57, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

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(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index c56cbc6c0ba8..da88ea6cb814 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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 = diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c index eb86c8694f47..b56c6961b278 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c @@ -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); diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 89053e761a69..2c84622faa44 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -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

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 3672dea3edca..548c27294c64 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, 4 Aug 2020 at 12:57, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

This makes it easier to cleanup things

Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

drivers/gpu/drm/ttm/ttm_bo.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index da88ea6cb814..af1b1c3f6ed2 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

Am 04.08.20 um 04:55 schrieb Dave Airlie:

From: Dave Airlie airlied@redhat.com

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

Signed-off-by: Dave Airlie airlied@redhat.com

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

---

drivers/gpu/drm/ttm/ttm_bo.c | 6 ++---- include/drm/ttm/ttm_bo_driver.h | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index af1b1c3f6ed2..127a0b62bf98 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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; }

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 548c27294c64..41bfa514c29d 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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
  */

On Tue, 4 Aug 2020 at 21:20, Christian König christian.koenig@amd.com wrote:

Am 04.08.20 um 04:55 schrieb Dave Airlie:

...

From: Dave Airlie airlied@redhat.com

Allow the takedown path callback to be optional as well.

v2: use fini for range manager Signed-off-by: Dave Airlie airlied@redhat.com

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

Reviewed-by: Ben Skeggs bskeggs@redhat.com

...

---

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(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 127a0b62bf98..a45038c74de6 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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);

diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c index b56c6961b278..96da22be672b 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c @@ -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
  

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 41bfa514c29d..9b4c22abc22c 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Aug 04, 2020 at 12:56:06PM +1000, Dave Airlie wrote:

From: Dave Airlie airlied@redhat.com

Signed-off-by: Dave Airlie airlied@redhat.com

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(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 4f4d22bac477..f368a9cc0c2a 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -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);

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index c6530d7b6d51..aa763c6b1146 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -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

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c index 141fb14e3583..ec1b5bb01a93 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c @@ -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) {

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:

Reviewed-by: Daniel Vetter daniel.vetter@ffwll.ch

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,

};

2.26.2

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, 4 Aug 2020 at 12:58, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

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

Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

drivers/gpu/drm/ttm/ttm_bo_manager.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c index 96da22be672b..86bf5e71e959 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, 4 Aug 2020 at 12:58, Dave Airlie airlied@gmail.com wrote:

From: Dave Airlie airlied@redhat.com

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.

Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Dave Airlie airlied@redhat.com

Reviewed-by: Ben Skeggs bskeggs@redhat.com

---

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(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index a45038c74de6..ebecb796dd49 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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);
  
  

diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 2c84622faa44..9c55eafd0e7d 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -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

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 9b4c22abc22c..8cc39cd55a14 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

Am 04.08.20 um 04:56 schrieb Dave Airlie:

From: Dave Airlie airlied@redhat.com

This will allow different abstractions later.

Signed-off-by: Dave Airlie airlied@redhat.com

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

---

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(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index ebecb796dd49..8777c323e7de 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -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);

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 1f502be0b646..879c8ded0cd8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -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;

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 468a0eb9e632..5ae679184eb5 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -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

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 8cc39cd55a14..e80deee3ae99 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -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