ttm misc cleanups, mem refactoring, rename objects. (v2)
Subsystems (8)
Dave Airlie
maintainercover 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
Dave Airlie
maintainerPATCH 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 2/59 drm/vmwgfx: drop bo map/unmap dma functions.
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 3/59 nouveau: use ttm populate mapping functions. (v2)
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 5/59 drm/ttm/amdgpu: consolidate ttm reserve paths
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 6/59 drm/ttm: use a helper for unlocked moves to the lru tail
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 4/59 qxl/ttm: drop the unusued no wait flag to reserve function
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 7/59 drm/vram-helper: remove populate/unpopulate
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 8/59 drm/ttm: export memory type debug entrypoint.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 9/59 drm/nouveau/ttm: don't fill in blank ttm debug callback
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 10/59 drm/vmwgfx/gmrid: don't provide pointless ttm debug callback
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 12/59 drm/vram-helper: call the ttm manager debug function
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 13/59 drm/ttm: split the mm manager init code (v2)
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 14/59 drm/ttm: provide a driver-led init path for range mm manager. (v2)
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 15/59 drm/amdgpu/ttm: init managers from the driver side.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 16/59 drm/radeon: use new ttm man init path
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 18/59 drm/vram_helper: use new ttm manager init function
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 20/59 drm/vmwgfx/ttm: convert vram mm init to new code paths
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 17/59 drm/qxl/ttm: use new init path for manager
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 19/59 drm/nouveau: use new memory manager init paths
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 22/59 drm/ttm: convert system manager init to new code.
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 21/59 drm/vmwgfx/ttm: switch gmrid allocator to new init paths.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 23/59 drm/ttm: purge old manager init path.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 24/59 drm/ttm: pass man around instead of mem_type in some places
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 25/59 drm/ttm: make some inline helper functions for cleanup paths. (v2)
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 27/59 drm/amdgpu/ttm: use new takedown path
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 26/59 drm/ttm: start allowing drivers to use new takedown path (v2)
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 29/59 drm/vram_helper: call explicit mm takedown
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 28/59 drm/vmwgfx: takedown vram manager
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 30/59 drm/nouveau: use new cleanup paths
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 31/59 drm/radeon/ttm: use new takedown paths
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 32/59 drm/qxl/ttm: use new takedown path
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 34/59 drm/ttm: remove range manager legacy takedown path
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 33/59 drm/vmwgfx: fix gmrid takedown paths to new interface
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 35/59 drm/ttm: make TTM responsible for cleaning system only.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 36/59 drm/ttm: add wrapper to get manager from bdev.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 11/59 drm/qxl/ttm: call ttm manager debug (v2)
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 37/59 drm/amdgfx/ttm: use wrapper to get ttm memory managers
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_filemin (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_fileatomic64_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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 39/59 drm/nouveau/ttm: use wrapper to access memory managers
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 38/59 drm/vram-helper: use wrapper to access memory managers
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 40/59 drm/qxl/ttm: use wrapper to access memory manager
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 42/59 drm/vmwgfx/ttm: use wrapper to access memory manager
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 44/59 drm/ttm: allow drivers to provide their own manager subclasses
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 43/59 drm/ttm: rename manager variable to make sure wrapper is used.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 45/59 drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 46/59 drm/ttm: make ttm_range_man_init/takedown take type + args
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 47/59 drm/ttm: move range manager to subclassed driver allocation
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 48/59 drm/vmwgfx/ttm: move thp to driver managed
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 49/59 drm/vmwgfx/gmrid: convert to driver controlled allocation.
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 50/59 drm/nouveau/ttm: move to driver allocated manager
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 51/59 drm/ttm: drop priv pointer in memory manager
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 52/59 drm/amdgpu/ttm: remove man->bdev references.
In reply to Dave AirlieFrom: 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
@@ -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
Dave Airlie
maintainerPATCH 53/59 drm/ttm: drop man->bdev link.
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 54/59 drm/ttm: drop list of memory managers from device. (v2)
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerPATCH 55/59 drm/ttm: drop type manager has_type
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
under driver control, this flag isn't needed anymore, remove the API that used to access it, and consoldiate with the used api.
--- 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 | 4 ++-- drivers/gpu/drm/ttm/ttm_bo.c | 8 +++----- 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_driver.h | 17 ----------------- 8 files changed, 10 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +1 -1
@@ -146,7 +146,7 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (&adev->mman.bdev, man);if (ret)
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -1
@@ -223,7 +223,7 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (&adev->mman.bdev, man);if (ret)
drivers/gpu/drm/nouveau/nouveau_ttm.c +2 -2
@@ -194,7 +194,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)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); +ttm_mem_type_manager_set_used (man, false);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 );
@@ -253,7 +253,7 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm) drm->agp.bridge) ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_TT); else { -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false);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 );
drivers/gpu/drm/ttm/ttm_bo.c +3 -5
@@ -80,7 +80,6 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place,void ttm_mem_type_manager_debug (struct ttm_mem_type_manager *man,struct drm_printer *p) { -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);
@@ -1003,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,return ret; man =ttm_manager_type (bdev, mem_type); -if (!man->has_type || !man->use_type) +if (!man || !man->use_type)return -EBUSY ;if (!ttm_bo_mt_compatible (man, mem_type, place, &cur_flags))
@@ -1462,7 +1461,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)return -EINVAL ; } -if (!man->has_type) { +if (!man) {pr_err ("Memory type %u has not been initialized\n" , mem_type);return 0 ; }
@@ -1476,7 +1475,6 @@ void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man, {unsigned i; -BUG_ON (man->has_type); man->use_io_reserve_lru = false;mutex_init (&man->io_reserve_mutex);spin_lock_init (&man->move_lock);
@@ -1557,7 +1555,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)struct ttm_mem_type_manager *man; man =ttm_manager_type (bdev,TTM_PL_SYSTEM ); -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false);ttm_set_driver_manager (bdev,TTM_PL_SYSTEM ,NULL );mutex_lock (&ttm_global_mutex);
drivers/gpu/drm/ttm/ttm_bo_manager.c +1 -1
@@ -152,7 +152,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,struct drm_mm *mm = &rman->mm;int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (bdev, man);if (ret)
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1 -1
@@ -143,7 +143,7 @@ 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 =to_gmrid_manager (man); -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false);ttm_mem_type_manager_force_list_clean (&dev_priv->bdev, man);
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +1 -1
@@ -152,7 +152,7 @@ void vmw_thp_fini(struct vmw_private *dev_priv)struct drm_mm *mm = &rman->mm;int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (&dev_priv->bdev, man);if (ret)
include/drm/ttm/ttm_bo_driver.h +0 -17
@@ -111,7 +111,6 @@ struct ttm_mem_type_manager_func {/** * struct ttm_mem_type_manager * -* @has_type: The memory type has been initialized. * @use_type: The memory type is enabled. * @flags: TTM_MEMTYPE_XX flags identifying the traits of the memory * managed by this memory type.
@@ -141,8 +140,6 @@ struct ttm_mem_type_manager {/* * No protection. Constant from start. */ - -bool has_type;bool use_type;bool use_tt;uint64_t size;
@@ -678,23 +675,9 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)*/ 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_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 *
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 57/59 drm/ttm: rename bo manager to range manager.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
The generic manager is called the range manager now, rename the file and some internals.
---
drivers/gpu/drm/ttm/Makefile | 2 +-
.../{ttm_bo_manager.c => ttm_range_manager.c} | 26 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
rename drivers/gpu/drm/ttm/{ttm_bo_manager.c => ttm_range_manager.c} (88%)drivers/gpu/drm/ttm/Makefile +1 -1
@@ -4,7 +4,7 @@ ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ - ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o + ttm_execbuf_util.o ttm_page_alloc.o ttm_range_manager.o ttm-$(CONFIG_AGP) += ttm_agp_backend.o ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.o
drivers/gpu/drm/ttm/ttm_range_manager.c renamed from drivers/gpu/drm/ttm/ttm_bo_manager.c +13 -13
@@ -54,10 +54,10 @@ static inline struct ttm_range_manager *to_range_manager(struct ttm_mem_type_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) +static int ttm_range_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 =to_range_manager (man);struct drm_mm *mm = &rman->mm;
@@ -95,8 +95,8 @@ static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,return ret; } -static void ttm_bo_man_put_node (struct ttm_mem_type_manager *man, -struct ttm_mem_reg *mem) +static void ttm_range_man_put_node (struct ttm_mem_type_manager *man, +struct ttm_mem_reg *mem) {struct ttm_range_manager *rman =to_range_manager (man);
@@ -110,7 +110,7 @@ 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; +static const struct ttm_mem_type_manager_func ttm_range_manager_func; int ttm_range_man_init(struct ttm_bo_device *bdev, unsigned type,
@@ -131,7 +131,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev, man->default_caching = default_caching; man->use_tt = use_tt; - man->func = &ttm_bo_manager_func; + man->func = &ttm_range_manager_func;ttm_mem_type_manager_init (man, p_size);
@@ -170,7 +170,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev, }EXPORT_SYMBOL (ttm_range_man_fini); -static void ttm_bo_man_debug (struct ttm_mem_type_manager *man, +static void ttm_range_man_debug (struct ttm_mem_type_manager *man,struct drm_printer *printer) {struct ttm_range_manager *rman =to_range_manager (man);
@@ -180,8 +180,8 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,spin_unlock (&rman->lock); } -static const struct ttm_mem_type_manager_func ttm_bo_manager_func = { - .get_node = ttm_bo_man_get_node, - .put_node = ttm_bo_man_put_node, - .debug = ttm_bo_man_debug +static const struct ttm_mem_type_manager_func ttm_range_manager_func = { + .get_node = ttm_range_man_get_node, + .put_node = ttm_range_man_put_node, + .debug = ttm_range_man_debug };
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 56/59 drm/ttm: add a wrapper for checking if manager is in use
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This converts vmwgfx over to using an interface to set the in use and check the in use flag.
--- drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 - drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 14 +++++++------- include/drm/ttm/ttm_bo_driver.h | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 9 deletions(-)
drivers/gpu/drm/nouveau/nouveau_ttm.c +0 -1
@@ -240,7 +240,6 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)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); -return 0 ; }
drivers/gpu/drm/ttm/ttm_bo.c +1 -1
@@ -1002,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,return ret; man =ttm_manager_type (bdev, mem_type); -if (!man || !man->use_type) +if (!man || !ttm_mem_type_manager_used (man))return -EBUSY ;if (!ttm_bo_mt_compatible (man, mem_type, place, &cur_flags))
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +7 -7
@@ -630,7 +630,7 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)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; +ttm_mem_type_manager_set_used (ttm_manager_type (&dev_priv->bdev,TTM_PL_VRAM ), false);return ret; }
@@ -1192,9 +1192,9 @@ 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 (!man->use_type) { +if (!ttm_mem_type_manager_used (man)) {vmw_write (dev_priv,SVGA_REG_ENABLE ,SVGA_REG_ENABLE ); - man->use_type = true; +ttm_mem_type_manager_set_used (man, true); }spin_unlock (&dev_priv->svga_lock); }
@@ -1223,8 +1223,8 @@ 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 (man->use_type) { - man->use_type = false; +if (ttm_mem_type_manager_used (man)) { +ttm_mem_type_manager_set_used (man, false);vmw_write (dev_priv,SVGA_REG_ENABLE ,SVGA_REG_ENABLE_HIDE |SVGA_REG_ENABLE_ENABLE );
@@ -1257,8 +1257,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 (man->use_type) { - man->use_type = false; +if (ttm_mem_type_manager_used (man)) { +ttm_mem_type_manager_set_used (man, 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" );
include/drm/ttm/ttm_bo_driver.h +14 -0
@@ -678,6 +678,20 @@ static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma man->use_type = used; } +/** +* ttm_mem_type_manager_used +* +* @man: Manager to get used state for +* +* Get the in use flag for a manager. +* Returns: +* true is used, false if not. +*/ +static inline bool ttm_mem_type_manager_used (struct ttm_mem_type_manager *man) +{ +return man->use_type; +} +/** * ttm_mem_type_manager_cleanup *
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 58/59 drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This name makes a lot more sense, since these are about managing driver resources rather than just memory ranges.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 36 +++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 36 +++++----- drivers/gpu/drm/drm_gem_vram_helper.c | 4 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 46 ++++++------- drivers/gpu/drm/nouveau/nouveau_ttm.h | 6 +- drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- drivers/gpu/drm/ttm/ttm_bo.c | 66 +++++++++---------- drivers/gpu/drm/ttm/ttm_bo_util.c | 26 ++++---- drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- drivers/gpu/drm/ttm/ttm_range_manager.c | 28 ++++---- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +++--- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 26 ++++---- drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 26 ++++---- include/drm/ttm/ttm_bo_api.h | 6 +- include/drm/ttm/ttm_bo_driver.h | 60 ++++++++--------- 23 files changed, 210 insertions(+), 210 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +1 -1
@@ -517,7 +517,7 @@ 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 ); +struct ttm_resource_manager *vram_man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM );return amdgpu_vram_mgr_usage (vram_man); }
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -1
@@ -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 ); +struct ttm_resource_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. *
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +18 -18
@@ -25,13 +25,13 @@#include "amdgpu.h" struct amdgpu_gtt_mgr { -struct ttm_mem_type_manager manager; +struct ttm_resource_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) +static inline struct amdgpu_gtt_mgr *to_gtt_mgr (struct ttm_resource_manager *man) { return container_of(man, struct amdgpu_gtt_mgr, manager); }
@@ -54,7 +54,7 @@ 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 ); +struct ttm_resource_manager *man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT );return snprintf (buf,PAGE_SIZE ,"%llu\n" , man->size *PAGE_SIZE ); }
@@ -72,7 +72,7 @@ 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 ); +struct ttm_resource_manager *man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT );return snprintf (buf,PAGE_SIZE ,"%llu\n" ,amdgpu_gtt_mgr_usage (man)); }
@@ -82,7 +82,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; +static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func;/** * amdgpu_gtt_mgr_init - init GTT manager and DRM MM *
@@ -93,7 +93,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; +struct ttm_resource_manager *man;struct amdgpu_gtt_mgr *mgr;uint64_t start, size;int ret;
@@ -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 (man, gtt_size >>PAGE_SHIFT ); +ttm_resource_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;
@@ -128,7 +128,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size) }ttm_set_driver_manager (&adev->mman.bdev,TTM_PL_TT , &mgr->manager); -ttm_mem_type_manager_set_used (man, true); +ttm_resource_manager_set_used (man, true);return 0 ; }
@@ -142,13 +142,13 @@ 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 ttm_resource_manager *man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT );struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);int ret; -ttm_mem_type_manager_set_used (man, false); +ttm_resource_manager_set_used (man, false); - ret =ttm_mem_type_manager_force_list_clean (&adev->mman.bdev, man); + ret =ttm_resource_manager_force_list_clean (&adev->mman.bdev, man);if (ret)return ;
@@ -159,7 +159,7 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)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_resource_manager_cleanup (man);ttm_set_driver_manager (&adev->mman.bdev,TTM_PL_TT ,NULL );kfree (mgr); }
@@ -186,7 +186,7 @@ bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem)* * Dummy, allocate the node but no space for it yet. */ -static int amdgpu_gtt_mgr_new (struct ttm_mem_type_manager *man, +static int amdgpu_gtt_mgr_new (struct ttm_resource_manager *man,struct ttm_buffer_object *tbo,const struct ttm_place *place,struct ttm_mem_reg *mem)
@@ -249,7 +249,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,* * Free the allocated GTT again. */ -static void amdgpu_gtt_mgr_del (struct ttm_mem_type_manager *man, +static void amdgpu_gtt_mgr_del (struct ttm_resource_manager *man,struct ttm_mem_reg *mem) {struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);
@@ -272,7 +272,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,* * Return how many bytes are used in the GTT domain */ -uint64_t amdgpu_gtt_mgr_usage (struct ttm_mem_type_manager *man) +uint64_t amdgpu_gtt_mgr_usage (struct ttm_resource_manager *man) {struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);s64 result = man->size -atomic64_read (&mgr->available);
@@ -280,7 +280,7 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)return (result >0 ? result :0 ) *PAGE_SIZE ; } -int amdgpu_gtt_mgr_recover (struct ttm_mem_type_manager *man) +int amdgpu_gtt_mgr_recover (struct ttm_resource_manager *man) {struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);struct amdgpu_gtt_node *node;
@@ -307,7 +307,7 @@ int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)* * Dump the table content using printk. */ -static void amdgpu_gtt_mgr_debug (struct ttm_mem_type_manager *man, +static void amdgpu_gtt_mgr_debug (struct ttm_resource_manager *man,struct drm_printer *printer) {struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);
@@ -321,7 +321,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man, amdgpu_gtt_mgr_usage(man) >> 20); } -static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = { +static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = { .get_node = amdgpu_gtt_mgr_new, .put_node = amdgpu_gtt_mgr_del, .debug = amdgpu_gtt_mgr_debug
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +2 -2
@@ -631,9 +631,9 @@ 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 = +struct ttm_resource_manager *vram_man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); -struct ttm_mem_type_manager *gtt_man = +struct ttm_resource_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;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
@@ -442,7 +442,7 @@ void amdgpu_bo_free_kernel(struct amdgpu_bo **bo, u64 *gpu_addr,static bool amdgpu_bo_validate_size (struct amdgpu_device *adev,unsigned long size,u32 domain) { -struct ttm_mem_type_manager *man =NULL ; +struct ttm_resource_manager *man =NULL ;/* * If GTT is part of requested domains the check must succeed to
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -2
@@ -2030,7 +2030,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 =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); +struct ttm_resource_manager *man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM );uint64_t size;int r;
@@ -2252,7 +2252,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 =ttm_manager_type (&adev->mman.bdev, ttm_pl); +struct ttm_resource_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_ttm.h +4 -4
@@ -73,8 +73,8 @@ 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); -int amdgpu_gtt_mgr_recover (struct ttm_mem_type_manager *man); +uint64_t amdgpu_gtt_mgr_usage (struct ttm_resource_manager *man); +int amdgpu_gtt_mgr_recover (struct ttm_resource_manager *man);u64 amdgpu_vram_mgr_bo_visible_size (struct amdgpu_bo *bo); int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev,
@@ -86,8 +86,8 @@ void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,struct device *dev, enum dma_data_direction dir, struct sg_table *sgt); -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); +uint64_t amdgpu_vram_mgr_usage (struct ttm_resource_manager *man); +uint64_t amdgpu_vram_mgr_vis_usage (struct ttm_resource_manager *man);int amdgpu_ttm_init (struct amdgpu_device *adev);void amdgpu_ttm_late_init (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +18 -18
@@ -29,7 +29,7 @@#include "atom.h" struct amdgpu_vram_mgr { -struct ttm_mem_type_manager manager; +struct ttm_resource_manager manager;struct drm_mm mm;spinlock_t lock;atomic64_t usage;
@@ -37,7 +37,7 @@ struct amdgpu_vram_mgr {struct amdgpu_device *adev; }; -static inline struct amdgpu_vram_mgr *to_vram_mgr (struct ttm_mem_type_manager *man) +static inline struct amdgpu_vram_mgr *to_vram_mgr (struct ttm_resource_manager *man) { return container_of(man, struct amdgpu_vram_mgr, manager); }
@@ -89,7 +89,7 @@ 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 ); +struct ttm_resource_manager *man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM );return snprintf (buf,PAGE_SIZE ,"%llu\n" ,amdgpu_vram_mgr_usage (man)); }
@@ -107,7 +107,7 @@ 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 ); +struct ttm_resource_manager *man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM );return snprintf (buf,PAGE_SIZE ,"%llu\n" ,amdgpu_vram_mgr_vis_usage (man)); }
@@ -165,7 +165,7 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = { NULL }; -static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; +static const struct ttm_resource_manager_func amdgpu_vram_mgr_func;/** * amdgpu_vram_mgr_init - init VRAM manager and DRM MM
@@ -177,7 +177,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; +struct ttm_resource_manager *man;struct amdgpu_vram_mgr *mgr;int ret;
@@ -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 (man, adev->gmc.real_vram_size >>PAGE_SHIFT ); +ttm_resource_manager_init (man, adev->gmc.real_vram_size >>PAGE_SHIFT ); man->func = &amdgpu_vram_mgr_func;
@@ -205,7 +205,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)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); +ttm_resource_manager_set_used (man, true);return 0 ; }
@@ -219,13 +219,13 @@ 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 ttm_resource_manager *man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM );struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);int ret; -ttm_mem_type_manager_set_used (man, false); +ttm_resource_manager_set_used (man, false); - ret =ttm_mem_type_manager_force_list_clean (&adev->mman.bdev, man); + ret =ttm_resource_manager_force_list_clean (&adev->mman.bdev, man);if (ret)return ;
@@ -235,7 +235,7 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)sysfs_remove_files (&adev->dev->kobj, amdgpu_vram_mgr_attributes); -ttm_mem_type_manager_cleanup (man); +ttm_resource_manager_cleanup (man);ttm_set_driver_manager (&adev->mman.bdev,TTM_PL_VRAM ,NULL );kfree (mgr); }
@@ -321,7 +321,7 @@ static void amdgpu_vram_mgr_virt_start(struct ttm_mem_reg *mem,* * Allocate VRAM for the given BO. */ -static int amdgpu_vram_mgr_new (struct ttm_mem_type_manager *man, +static int amdgpu_vram_mgr_new (struct ttm_resource_manager *man,struct ttm_buffer_object *tbo,const struct ttm_place *place,struct ttm_mem_reg *mem)
@@ -439,7 +439,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,* * Free the allocated VRAM again. */ -static void amdgpu_vram_mgr_del (struct ttm_mem_type_manager *man, +static void amdgpu_vram_mgr_del (struct ttm_resource_manager *man,struct ttm_mem_reg *mem) {struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);
@@ -573,7 +573,7 @@ void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,* * Returns how many bytes are used in this domain. */ -uint64_t amdgpu_vram_mgr_usage (struct ttm_mem_type_manager *man) +uint64_t amdgpu_vram_mgr_usage (struct ttm_resource_manager *man) {struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);
@@ -587,7 +587,7 @@ uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)* * Returns how many bytes are used in the visible part of VRAM */ -uint64_t amdgpu_vram_mgr_vis_usage (struct ttm_mem_type_manager *man) +uint64_t amdgpu_vram_mgr_vis_usage (struct ttm_resource_manager *man) {struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);
@@ -602,7 +602,7 @@ uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)* * Dump the table content using printk. */ -static void amdgpu_vram_mgr_debug (struct ttm_mem_type_manager *man, +static void amdgpu_vram_mgr_debug (struct ttm_resource_manager *man,struct drm_printer *printer) {struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);
@@ -616,7 +616,7 @@ static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man, amdgpu_vram_mgr_vis_usage(man) >> 20); } -static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = { +static const struct ttm_resource_manager_func amdgpu_vram_mgr_func = { .get_node = amdgpu_vram_mgr_new, .put_node = amdgpu_vram_mgr_del, .debug = amdgpu_vram_mgr_debug
drivers/gpu/drm/drm_gem_vram_helper.c +2 -2
@@ -1075,10 +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 ttm_mem_type_manager *man =ttm_manager_type (&vmm->bdev,TTM_PL_VRAM ); +struct ttm_resource_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); +ttm_resource_manager_debug (man, &p);return 0 ; }
drivers/gpu/drm/nouveau/nouveau_ttm.c +23 -23
139 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_ttm.h +3 -3
@@ -8,9 +8,9 @@ nouveau_bdev(struct ttm_bo_device *bd) return container_of(bd, struct nouveau_drm, ttm.bdev); } -extern const struct ttm_mem_type_manager_func nouveau_vram_manager; -extern const struct ttm_mem_type_manager_func nouveau_gart_manager; -extern const struct ttm_mem_type_manager_func nv04_gart_manager; +extern const struct ttm_resource_manager_func nouveau_vram_manager; +extern const struct ttm_resource_manager_func nouveau_gart_manager; +extern const struct ttm_resource_manager_func nv04_gart_manager;struct ttm_tt *nouveau_sgdma_create_ttm (struct ttm_buffer_object *bo,u32 page_flags);
drivers/gpu/drm/qxl/qxl_ttm.c +2 -2
@@ -274,10 +274,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 ttm_mem_type_manager *man = (struct ttm_mem_type_manager *)node->info_ent->data; +struct ttm_resource_manager *man = (struct ttm_resource_manager *)node->info_ent->data;struct drm_printer p =drm_seq_file_printer (m); -ttm_mem_type_manager_debug (man, &p); +ttm_resource_manager_debug (man, &p);return 0 ; }#endif
drivers/gpu/drm/radeon/radeon_gem.c +1 -1
@@ -224,7 +224,7 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data, {struct radeon_device *rdev = dev->dev_private;struct drm_radeon_gem_info *args = data; -struct ttm_mem_type_manager *man; +struct ttm_resource_manager *man; man =ttm_manager_type (&rdev->mman.bdev,TTM_PL_VRAM );
drivers/gpu/drm/radeon/radeon_ttm.c +2 -2
@@ -836,7 +836,7 @@ void radeon_ttm_fini(struct radeon_device *rdev)* isn't running */ void radeon_ttm_set_active_vram_size (struct radeon_device *rdev,u64 size) { -struct ttm_mem_type_manager *man; +struct ttm_resource_manager *man;if (!rdev->mman.initialized)return ;
@@ -895,7 +895,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 =ttm_manager_type (&rdev->mman.bdev, ttm_pl); +struct ttm_resource_manager *man =ttm_manager_type (&rdev->mman.bdev, ttm_pl);struct drm_printer p =drm_seq_file_printer (m); man->func->debug (man, &p);
drivers/gpu/drm/ttm/ttm_bo.c +33 -33
238 lines not on this page · raw message
drivers/gpu/drm/ttm/ttm_bo_util.c +13 -13
@@ -91,7 +91,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, }EXPORT_SYMBOL (ttm_bo_move_ttm); -int ttm_mem_io_lock (struct ttm_mem_type_manager *man,bool interruptible) +int ttm_mem_io_lock (struct ttm_resource_manager *man,bool interruptible) {if (likely (!man->use_io_reserve_lru))return 0 ;
@@ -103,7 +103,7 @@ int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible)return 0 ; } -void ttm_mem_io_unlock (struct ttm_mem_type_manager *man) +void ttm_mem_io_unlock (struct ttm_resource_manager *man) {if (likely (!man->use_io_reserve_lru))return ;
@@ -111,7 +111,7 @@ void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)mutex_unlock (&man->io_reserve_mutex); } -static int ttm_mem_io_evict (struct ttm_mem_type_manager *man) +static int ttm_mem_io_evict (struct ttm_resource_manager *man) {struct ttm_buffer_object *bo;
@@ -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 =ttm_manager_type (bdev, mem->mem_type); +struct ttm_resource_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 =ttm_manager_type (bo->bdev, bo->mem.mem_type); +struct ttm_resource_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 = ttm_manager_type(bdev, mem->mem_type); + struct ttm_resource_manager *man = ttm_manager_type(bdev, mem->mem_type);int ret;void *addr;
@@ -230,7 +230,7 @@ static void ttm_mem_reg_iounmap(struct ttm_bo_device *bdev,struct ttm_mem_reg *mem, void *virtual) { - struct ttm_mem_type_manager *man; + struct ttm_resource_manager *man; man =ttm_manager_type (bdev, mem->mem_type);
@@ -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 =ttm_manager_type (bdev, new_mem->mem_type); +struct ttm_resource_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;
@@ -570,7 +570,7 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page, unsigned long num_pages, struct ttm_bo_kmap_obj *map) { - struct ttm_mem_type_manager *man = + struct ttm_resource_manager *man =ttm_manager_type (bo->bdev, bo->mem.mem_type);unsigned long offset, size;int ret;
@@ -600,7 +600,7 @@ EXPORT_SYMBOL(ttm_bo_kmap);void ttm_bo_kunmap (struct ttm_bo_kmap_obj *map) {struct ttm_buffer_object *bo = map->bo; -struct ttm_mem_type_manager *man = +struct ttm_resource_manager *man =ttm_manager_type (bo->bdev, bo->mem.mem_type);if (!map->virtual)
@@ -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 =ttm_manager_type (bdev, new_mem->mem_type); +struct ttm_resource_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 =ttm_manager_type (bdev, old_mem->mem_type); -struct ttm_mem_type_manager *to =ttm_manager_type (bdev, new_mem->mem_type); +struct ttm_resource_manager *from =ttm_manager_type (bdev, old_mem->mem_type); +struct ttm_resource_manager *to =ttm_manager_type (bdev, new_mem->mem_type);int ret;
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -1
@@ -281,7 +281,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,pgoff_t i;vm_fault_t ret =VM_FAULT_NOPAGE ;unsigned long address = vmf->address; -struct ttm_mem_type_manager *man = +struct ttm_resource_manager *man =ttm_manager_type (bdev, bo->mem.mem_type);/*
drivers/gpu/drm/ttm/ttm_range_manager.c +14 -14
@@ -44,17 +44,17 @@*/ struct ttm_range_manager { -struct ttm_mem_type_manager manager; +struct ttm_resource_manager manager;struct drm_mm mm;spinlock_t lock; }; -static inline struct ttm_range_manager *to_range_manager (struct ttm_mem_type_manager *man) +static inline struct ttm_range_manager *to_range_manager (struct ttm_resource_manager *man) { return container_of(man, struct ttm_range_manager, manager); } -static int ttm_range_man_get_node (struct ttm_mem_type_manager *man, +static int ttm_range_man_get_node (struct ttm_resource_manager *man,struct ttm_buffer_object *bo,const struct ttm_place *place,struct ttm_mem_reg *mem)
@@ -95,7 +95,7 @@ static int ttm_range_man_get_node(struct ttm_mem_type_manager *man,return ret; } -static void ttm_range_man_put_node (struct ttm_mem_type_manager *man, +static void ttm_range_man_put_node (struct ttm_resource_manager *man,struct ttm_mem_reg *mem) {struct ttm_range_manager *rman =to_range_manager (man);
@@ -110,7 +110,7 @@ static void ttm_range_man_put_node(struct ttm_mem_type_manager *man, } } -static const struct ttm_mem_type_manager_func ttm_range_manager_func; +static const struct ttm_resource_manager_func ttm_range_manager_func; int ttm_range_man_init(struct ttm_bo_device *bdev, unsigned type,
@@ -119,7 +119,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev, bool use_tt, unsigned long p_size) { -struct ttm_mem_type_manager *man; +struct ttm_resource_manager *man;struct ttm_range_manager *rman; rman =kzalloc (sizeof (*rman),GFP_KERNEL );
@@ -133,13 +133,13 @@ int ttm_range_man_init(struct ttm_bo_device *bdev, man->func = &ttm_range_manager_func; -ttm_mem_type_manager_init (man, p_size); +ttm_resource_manager_init (man, p_size);drm_mm_init (&rman->mm,0 , p_size);spin_lock_init (&rman->lock);ttm_set_driver_manager (bdev, type, &rman->manager); -ttm_mem_type_manager_set_used (man, true); +ttm_resource_manager_set_used (man, true);return 0 ; }EXPORT_SYMBOL (ttm_range_man_init);
@@ -147,14 +147,14 @@ EXPORT_SYMBOL(ttm_range_man_init);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_resource_manager *man =ttm_manager_type (bdev, type);struct ttm_range_manager *rman =to_range_manager (man);struct drm_mm *mm = &rman->mm;int ret; -ttm_mem_type_manager_set_used (man, false); +ttm_resource_manager_set_used (man, false); - ret =ttm_mem_type_manager_force_list_clean (bdev, man); + ret =ttm_resource_manager_force_list_clean (bdev, man);if (ret)return ret;
@@ -163,14 +163,14 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,drm_mm_takedown (mm);spin_unlock (&rman->lock); -ttm_mem_type_manager_cleanup (man); +ttm_resource_manager_cleanup (man);ttm_set_driver_manager (bdev, type,NULL );kfree (rman);return 0 ; }EXPORT_SYMBOL (ttm_range_man_fini); -static void ttm_range_man_debug (struct ttm_mem_type_manager *man, +static void ttm_range_man_debug (struct ttm_resource_manager *man,struct drm_printer *printer) {struct ttm_range_manager *rman =to_range_manager (man);
@@ -180,7 +180,7 @@ static void ttm_range_man_debug(struct ttm_mem_type_manager *man,spin_unlock (&rman->lock); } -static const struct ttm_mem_type_manager_func ttm_range_manager_func = { +static const struct ttm_resource_manager_func ttm_range_manager_func = { .get_node = ttm_range_man_get_node, .put_node = ttm_range_man_put_node, .debug = ttm_range_man_debug
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +10 -10
@@ -630,7 +630,7 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)TTM_PL_FLAG_CACHED ,TTM_PL_FLAG_CACHED , false, dev_priv->vram_size >> PAGE_SHIFT);#endif -ttm_mem_type_manager_set_used (ttm_manager_type (&dev_priv->bdev,TTM_PL_VRAM ), false); +ttm_resource_manager_set_used (ttm_manager_type (&dev_priv->bdev,TTM_PL_VRAM ), false);return ret; }
@@ -1189,12 +1189,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 ); +struct ttm_resource_manager *man =ttm_manager_type (&dev_priv->bdev,TTM_PL_VRAM );spin_lock (&dev_priv->svga_lock); -if (!ttm_mem_type_manager_used (man)) { +if (!ttm_resource_manager_used (man)) {vmw_write (dev_priv,SVGA_REG_ENABLE ,SVGA_REG_ENABLE ); -ttm_mem_type_manager_set_used (man, true); +ttm_resource_manager_set_used (man, true); }spin_unlock (&dev_priv->svga_lock); }
@@ -1220,11 +1220,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 ); +struct ttm_resource_manager *man =ttm_manager_type (&dev_priv->bdev,TTM_PL_VRAM );spin_lock (&dev_priv->svga_lock); -if (ttm_mem_type_manager_used (man)) { -ttm_mem_type_manager_set_used (man, false); +if (ttm_resource_manager_used (man)) { +ttm_resource_manager_set_used (man, false);vmw_write (dev_priv,SVGA_REG_ENABLE ,SVGA_REG_ENABLE_HIDE |SVGA_REG_ENABLE_ENABLE );
@@ -1241,7 +1241,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 ); +struct ttm_resource_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 +1257,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 (ttm_mem_type_manager_used (man)) { -ttm_mem_type_manager_set_used (man, false); +if (ttm_resource_manager_used (man)) { +ttm_resource_manager_set_used (man, 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 +13 -13
@@ -37,7 +37,7 @@#include <linux/kernel.h> struct vmwgfx_gmrid_man { -struct ttm_mem_type_manager manager; +struct ttm_resource_manager manager;spinlock_t lock;struct ida gmr_ida;uint32_t max_gmr_ids;
@@ -45,12 +45,12 @@ struct vmwgfx_gmrid_man {uint32_t used_gmr_pages; }; -static struct vmwgfx_gmrid_man *to_gmrid_manager (struct ttm_mem_type_manager *man) +static struct vmwgfx_gmrid_man *to_gmrid_manager (struct ttm_resource_manager *man) { return container_of(man, struct vmwgfx_gmrid_man, manager); } -static int vmw_gmrid_man_get_node (struct ttm_mem_type_manager *man, +static int vmw_gmrid_man_get_node (struct ttm_resource_manager *man,struct ttm_buffer_object *bo,const struct ttm_place *place,struct ttm_mem_reg *mem)
@@ -84,7 +84,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,return -ENOSPC ; } -static void vmw_gmrid_man_put_node (struct ttm_mem_type_manager *man, +static void vmw_gmrid_man_put_node (struct ttm_resource_manager *man,struct ttm_mem_reg *mem) {struct vmwgfx_gmrid_man *gman =to_gmrid_manager (man);
@@ -98,11 +98,11 @@ static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man, } } -static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func; +static const struct ttm_resource_manager_func vmw_gmrid_manager_func;int vmw_gmrid_man_init (struct vmw_private *dev_priv,int type) { -struct ttm_mem_type_manager *man; +struct ttm_resource_manager *man;struct vmwgfx_gmrid_man *gman =kzalloc (sizeof (*gman),GFP_KERNEL );
@@ -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 (man,0 ); +ttm_resource_manager_init (man,0 );spin_lock_init (&gman->lock); gman->used_gmr_pages =0 ;ida_init (&gman->gmr_ida);
@@ -134,20 +134,20 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)BUG (); }ttm_set_driver_manager (&dev_priv->bdev, type, &gman->manager); -ttm_mem_type_manager_set_used (man, true); +ttm_resource_manager_set_used (man, true);return 0 ; }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 ttm_resource_manager *man =ttm_manager_type (&dev_priv->bdev, type);struct vmwgfx_gmrid_man *gman =to_gmrid_manager (man); -ttm_mem_type_manager_set_used (man, false); +ttm_resource_manager_set_used (man, false); -ttm_mem_type_manager_force_list_clean (&dev_priv->bdev, man); +ttm_resource_manager_force_list_clean (&dev_priv->bdev, man); -ttm_mem_type_manager_cleanup (man); +ttm_resource_manager_cleanup (man);ttm_set_driver_manager (&dev_priv->bdev, type,NULL );ida_destroy (&gman->gmr_ida);
@@ -155,7 +155,7 @@ void vmw_gmrid_man_fini(struct vmw_private *dev_priv, int type) } -static const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = { +static const struct ttm_resource_manager_func vmw_gmrid_manager_func = { .get_node = vmw_gmrid_man_get_node, .put_node = vmw_gmrid_man_put_node, };
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +13 -13
@@ -16,12 +16,12 @@* @lock: Manager lock. */ struct vmw_thp_manager { -struct ttm_mem_type_manager manager; +struct ttm_resource_manager manager;struct drm_mm mm;spinlock_t lock; }; -static struct vmw_thp_manager *to_thp_manager (struct ttm_mem_type_manager *man) +static struct vmw_thp_manager *to_thp_manager (struct ttm_resource_manager *man) { return container_of(man, struct vmw_thp_manager, manager); }
@@ -44,7 +44,7 @@ static int vmw_thp_insert_aligned(struct drm_mm *mm, struct drm_mm_node *node,return -ENOSPC ; } -static int vmw_thp_get_node (struct ttm_mem_type_manager *man, +static int vmw_thp_get_node (struct ttm_resource_manager *man,struct ttm_buffer_object *bo,const struct ttm_place *place,struct ttm_mem_reg *mem)
@@ -106,7 +106,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, +static void vmw_thp_put_node (struct ttm_resource_manager *man,struct ttm_mem_reg *mem) {struct vmw_thp_manager *rman =to_thp_manager (man);
@@ -123,7 +123,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; +struct ttm_resource_manager *man;struct vmw_thp_manager *rman; rman =kzalloc (sizeof (*rman),GFP_KERNEL );
@@ -134,39 +134,39 @@ 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 (man, +ttm_resource_manager_init (man, dev_priv->vram_size >>PAGE_SHIFT );drm_mm_init (&rman->mm,0 , man->size);spin_lock_init (&rman->lock);ttm_set_driver_manager (&dev_priv->bdev,TTM_PL_VRAM , &rman->manager); -ttm_mem_type_manager_set_used (man, true); +ttm_resource_manager_set_used (man, true);return 0 ; }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 ttm_resource_manager *man =ttm_manager_type (&dev_priv->bdev,TTM_PL_VRAM );struct vmw_thp_manager *rman =to_thp_manager (man);struct drm_mm *mm = &rman->mm;int ret; -ttm_mem_type_manager_set_used (man, false); +ttm_resource_manager_set_used (man, false); - ret =ttm_mem_type_manager_force_list_clean (&dev_priv->bdev, man); + ret =ttm_resource_manager_force_list_clean (&dev_priv->bdev, man);if (ret)return ;spin_lock (&rman->lock);drm_mm_clean (mm);drm_mm_takedown (mm);spin_unlock (&rman->lock); -ttm_mem_type_manager_cleanup (man); +ttm_resource_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, +static void vmw_thp_debug (struct ttm_resource_manager *man,struct drm_printer *printer) {struct vmw_thp_manager *rman =to_thp_manager (man);
@@ -176,7 +176,7 @@ static void vmw_thp_debug(struct ttm_mem_type_manager *man,spin_unlock (&rman->lock); } -const struct ttm_mem_type_manager_func vmw_thp_func = { +const struct ttm_resource_manager_func vmw_thp_func = { .get_node = vmw_thp_get_node, .put_node = vmw_thp_put_node, .debug = vmw_thp_debug
include/drm/ttm/ttm_bo_api.h +3 -3
@@ -54,7 +54,7 @@ struct ttm_place;struct ttm_lru_bulk_move ; -struct ttm_mem_type_manager ; +struct ttm_resource_manager ;/** * struct ttm_bus_placement
@@ -534,14 +534,14 @@ int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size, struct ttm_buffer_object **p_bo);/** -* ttm_mem_type_manager_init +* ttm_resource_manager_init * * @man: memory manager object to init * @p_size: size managed area in pages. * * Initialise core parts of a manager object. */ -void ttm_mem_type_manager_init (struct ttm_mem_type_manager *man, +void ttm_resource_manager_init (struct ttm_resource_manager *man,unsigned long p_size);/**
include/drm/ttm/ttm_bo_driver.h +30 -30
201 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
Dave Airlie
maintainerPATCH 59/59 drm/ttm: rename ttm_mem_reg to ttm_resource.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This name better reflects what the object does. I didn't rename all the pointers it seemed too messy.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 46 +++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 10 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 12 ++--- drivers/gpu/drm/drm_gem_vram_helper.c | 6 +-- drivers/gpu/drm/nouveau/nouveau_bo.c | 28 +++++------ drivers/gpu/drm/nouveau/nouveau_bo.h | 14 +++--- drivers/gpu/drm/nouveau/nouveau_bo0039.c | 4 +- drivers/gpu/drm/nouveau/nouveau_bo5039.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo74c1.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo85b5.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo9039.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo90b5.c | 2 +- drivers/gpu/drm/nouveau/nouveau_boa0b5.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 8 ++-- drivers/gpu/drm/nouveau/nouveau_mem.h | 10 ++-- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 8 ++-- drivers/gpu/drm/nouveau/nv17_fence.c | 2 +- drivers/gpu/drm/nouveau/nv50_fence.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.h | 2 +- drivers/gpu/drm/qxl/qxl_ttm.c | 14 +++--- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_object.h | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 28 +++++------ drivers/gpu/drm/radeon/radeon_vm.c | 2 +- drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 26 +++++------ drivers/gpu/drm/ttm/ttm_bo_util.c | 46 +++++++++---------- drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- drivers/gpu/drm/ttm/ttm_tt.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 6 +-- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 8 ++-- include/drm/ttm/ttm_bo_api.h | 10 ++-- include/drm/ttm/ttm_bo_driver.h | 42 ++++++++--------- include/drm/ttm/ttm_tt.h | 10 ++-- 45 files changed, 202 insertions(+), 202 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +3 -3
@@ -171,7 +171,7 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)* * Check if a mem object has already address space allocated. */ -bool amdgpu_gtt_mgr_has_gart_addr (struct ttm_mem_reg *mem) +bool amdgpu_gtt_mgr_has_gart_addr (struct ttm_resource *mem) {return mem->mm_node !=NULL ; }
@@ -189,7 +189,7 @@ bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem)static int amdgpu_gtt_mgr_new (struct ttm_resource_manager *man,struct ttm_buffer_object *tbo,const struct ttm_place *place, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);struct amdgpu_gtt_node *node;
@@ -250,7 +250,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man,* Free the allocated GTT again. */ static void amdgpu_gtt_mgr_del (struct ttm_resource_manager *man, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);struct amdgpu_gtt_node *node = mem->mm_node;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -2
@@ -1268,11 +1268,11 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,*/ void amdgpu_bo_move_notify (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->bdev);struct amdgpu_bo *abo; -struct ttm_mem_reg *old_mem = &bo->mem; +struct ttm_resource *old_mem = &bo->mem;if (!amdgpu_bo_is_amdgpu_bo (bo))return ;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
@@ -283,7 +283,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer, uint64_t *flags);void amdgpu_bo_move_notify (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *new_mem); +struct ttm_resource *new_mem);void amdgpu_bo_release_notify (struct ttm_buffer_object *bo);int amdgpu_bo_fault_reserve_notify (struct ttm_buffer_object *bo); void amdgpu_bo_fence(struct amdgpu_bo *bo, struct dma_fence *fence,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +23 -23
148 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +5 -5
@@ -63,7 +63,7 @@ struct amdgpu_mman {struct amdgpu_copy_mem {struct ttm_buffer_object *bo; -struct ttm_mem_reg *mem; +struct ttm_resource *mem;unsigned long offset; };
@@ -72,13 +72,13 @@ 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); +bool amdgpu_gtt_mgr_has_gart_addr (struct ttm_resource *mem);uint64_t amdgpu_gtt_mgr_usage (struct ttm_resource_manager *man);int amdgpu_gtt_mgr_recover (struct ttm_resource_manager *man);u64 amdgpu_vram_mgr_bo_visible_size (struct amdgpu_bo *bo);int amdgpu_vram_mgr_alloc_sgt (struct amdgpu_device *adev, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,struct device *dev,enum dma_data_direction dir,struct sg_table **sgt);
@@ -142,9 +142,9 @@ bool amdgpu_ttm_tt_userptr_invalidated(struct ttm_tt *ttm, int *last_invalidated);bool amdgpu_ttm_tt_is_userptr (struct ttm_tt *ttm);bool amdgpu_ttm_tt_is_readonly (struct ttm_tt *ttm); -uint64_t amdgpu_ttm_tt_pde_flags (struct ttm_tt *ttm,struct ttm_mem_reg *mem); +uint64_t amdgpu_ttm_tt_pde_flags (struct ttm_tt *ttm,struct ttm_resource *mem);uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm, -struct ttm_mem_reg *mem); +struct ttm_resource *mem);int amdgpu_ttm_debugfs_init (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -1765,7 +1765,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,struct amdgpu_vm *vm = bo_va->base.vm;struct amdgpu_bo_va_mapping *mapping;dma_addr_t *pages_addr =NULL ; -struct ttm_mem_reg *mem; +struct ttm_resource *mem;struct drm_mm_node *nodes;struct dma_fence **last_update;struct dma_resv *resv;
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +6 -6
@@ -272,7 +272,7 @@ static u64 amdgpu_vram_mgr_vis_size(struct amdgpu_device *adev,u64 amdgpu_vram_mgr_bo_visible_size (struct amdgpu_bo *bo) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); -struct ttm_mem_reg *mem = &bo->tbo.mem; +struct ttm_resource *mem = &bo->tbo.mem;struct drm_mm_node *nodes = mem->mm_node;unsigned pages = mem->num_pages;u64 usage;
@@ -292,13 +292,13 @@ u64 amdgpu_vram_mgr_bo_visible_size(struct amdgpu_bo *bo)/** * amdgpu_vram_mgr_virt_start - update virtual start address * -* @mem: ttm_mem_reg to update +* @mem: ttm_resource to update * @node: just allocated node * * Calculate a virtual BO start address to easily check if everything is CPU * accessible. */ -static void amdgpu_vram_mgr_virt_start (struct ttm_mem_reg *mem, +static void amdgpu_vram_mgr_virt_start (struct ttm_resource *mem,struct drm_mm_node *node) {unsigned long start;
@@ -324,7 +324,7 @@ static void amdgpu_vram_mgr_virt_start(struct ttm_mem_reg *mem,static int amdgpu_vram_mgr_new (struct ttm_resource_manager *man,struct ttm_buffer_object *tbo,const struct ttm_place *place, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);struct amdgpu_device *adev = mgr->adev;
@@ -440,7 +440,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,* Free the allocated VRAM again. */ static void amdgpu_vram_mgr_del (struct ttm_resource_manager *man, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);struct amdgpu_device *adev = mgr->adev;
@@ -480,7 +480,7 @@ static void amdgpu_vram_mgr_del(struct ttm_resource_manager *man,* Allocate and fill a sg table from a VRAM allocation. */ int amdgpu_vram_mgr_alloc_sgt (struct amdgpu_device *adev, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,struct device *dev,enum dma_data_direction dir,struct sg_table **sgt)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -3
@@ -653,7 +653,7 @@ static void drm_gem_vram_bo_driver_evict_flags(struct drm_gem_vram_object *gbo,static void drm_gem_vram_bo_driver_move_notify (struct drm_gem_vram_object *gbo,bool evict, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct ttm_bo_kmap_obj *kmap = &gbo->kmap;
@@ -1020,7 +1020,7 @@ static void bo_driver_evict_flags(struct ttm_buffer_object *bo,static void bo_driver_move_notify (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct drm_gem_vram_object *gbo;
@@ -1034,7 +1034,7 @@ static void bo_driver_move_notify(struct ttm_buffer_object *bo, }static int bo_driver_io_mem_reserve (struct ttm_bo_device *bdev, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bdev);
drivers/gpu/drm/nouveau/nouveau_bo.c +14 -14
@@ -666,7 +666,7 @@ nouveau_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)static int nouveau_bo_move_prep (struct nouveau_drm *drm,struct ttm_buffer_object *bo, -struct ttm_mem_reg *reg) +struct ttm_resource *reg) {struct nouveau_mem *old_mem =nouveau_mem (&bo->mem);struct nouveau_mem *new_mem =nouveau_mem (reg);
@@ -698,7 +698,7 @@ nouveau_bo_move_prep(struct nouveau_drm *drm, struct ttm_buffer_object *bo,static int nouveau_bo_move_m2mf (struct ttm_buffer_object *bo,int evict,bool intr, -bool no_wait_gpu,struct ttm_mem_reg *new_reg) +bool no_wait_gpu,struct ttm_resource *new_reg) {struct nouveau_drm *drm =nouveau_bdev (bo->bdev);struct nouveau_channel *chan = drm->ttm.chan;
@@ -708,7 +708,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,/* create temporary vmas for the transfer and attach them to the * old nvkm_mem node, these will get cleaned up after ttm has -* destroyed the ttm_mem_reg +* destroyed the ttm_resource */ if (drm->client.device.info.family >=NV_DEVICE_INFO_V0_TESLA ) { ret =nouveau_bo_move_prep (drm, bo, new_reg);
@@ -744,7 +744,7 @@ nouveau_bo_move_init(struct nouveau_drm *drm)s32 oclass;int (*exec)(struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);int (*init)(struct nouveau_channel *,u32 handle); } _methods[] = { { "COPY", 4, 0xc5b5, nve0_bo_move_copy, nve0_bo_move_init },
@@ -805,7 +805,7 @@ nouveau_bo_move_init(struct nouveau_drm *drm)static int nouveau_bo_move_flipd (struct ttm_buffer_object *bo,bool evict,bool intr, -bool no_wait_gpu,struct ttm_mem_reg *new_reg) +bool no_wait_gpu,struct ttm_resource *new_reg) {struct ttm_operation_ctx ctx = { intr, no_wait_gpu };struct ttm_place placement_memtype = {
@@ -814,7 +814,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, .flags = TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING };struct ttm_placement placement; -struct ttm_mem_reg tmp_reg; +struct ttm_resource tmp_reg;int ret; placement.num_placement = placement.num_busy_placement =1 ;
@@ -842,7 +842,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,static int nouveau_bo_move_flips (struct ttm_buffer_object *bo,bool evict,bool intr, -bool no_wait_gpu,struct ttm_mem_reg *new_reg) +bool no_wait_gpu,struct ttm_resource *new_reg) {struct ttm_operation_ctx ctx = { intr, no_wait_gpu };struct ttm_place placement_memtype = {
@@ -851,7 +851,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, .flags = TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING };struct ttm_placement placement; -struct ttm_mem_reg tmp_reg; +struct ttm_resource tmp_reg;int ret; placement.num_placement = placement.num_busy_placement =1 ;
@@ -878,7 +878,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,static void nouveau_bo_move_ntfy (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *new_reg) +struct ttm_resource *new_reg) {struct nouveau_mem *mem = new_reg ?nouveau_mem (new_reg) :NULL ;struct nouveau_bo *nvbo =nouveau_bo (bo);
@@ -910,7 +910,7 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict, }static int -nouveau_bo_vm_bind (struct ttm_buffer_object *bo,struct ttm_mem_reg *new_reg, +nouveau_bo_vm_bind (struct ttm_buffer_object *bo,struct ttm_resource *new_reg,struct nouveau_drm_tile **new_tile) {struct nouveau_drm *drm =nouveau_bdev (bo->bdev);
@@ -946,11 +946,11 @@ nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo,static int nouveau_bo_move (struct ttm_buffer_object *bo,bool evict,struct ttm_operation_ctx *ctx, -struct ttm_mem_reg *new_reg) +struct ttm_resource *new_reg) {struct nouveau_drm *drm =nouveau_bdev (bo->bdev);struct nouveau_bo *nvbo =nouveau_bo (bo); -struct ttm_mem_reg *old_reg = &bo->mem; +struct ttm_resource *old_reg = &bo->mem;struct nouveau_drm_tile *new_tile =NULL ;int ret =0 ;
@@ -1019,7 +1019,7 @@ nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp) }static int -nouveau_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_mem_reg *reg) +nouveau_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_resource *reg) {struct nouveau_drm *drm =nouveau_bdev (bdev);struct nvkm_device *device =nvxx_device (&drm->client.device);
@@ -1099,7 +1099,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) }static void -nouveau_ttm_io_mem_free (struct ttm_bo_device *bdev,struct ttm_mem_reg *reg) +nouveau_ttm_io_mem_free (struct ttm_bo_device *bdev,struct ttm_resource *reg) {struct nouveau_drm *drm =nouveau_bdev (bdev);struct nouveau_mem *mem =nouveau_mem (reg);
drivers/gpu/drm/nouveau/nouveau_bo.h +7 -7
@@ -139,28 +139,28 @@ nouveau_bo_new_pin_map(struct nouveau_cli *cli, u64 size, int align, u32 flags,int nv04_bo_move_init (struct nouveau_channel *,u32 );int nv04_bo_move_m2mf (struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);int nv50_bo_move_init (struct nouveau_channel *,u32 );int nv50_bo_move_m2mf (struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);int nv84_bo_move_exec (struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);int nva3_bo_move_copy (struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);int nvc0_bo_move_init (struct nouveau_channel *,u32 );int nvc0_bo_move_m2mf (struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);int nvc0_bo_move_copy (struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);int nve0_bo_move_init (struct nouveau_channel *,u32 );int nve0_bo_move_copy (struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);#define NVBO_WR32_ (b,o,dr,f) nouveau_bo_wr32((b), (o)/4 + (dr), (f))#define NVBO_RD32_ (b,o,dr) nouveau_bo_rd32((b), (o)/4 + (dr))
drivers/gpu/drm/nouveau/nouveau_bo0039.c +2 -2
@@ -36,7 +36,7 @@static inline uint32_t nouveau_bo_mem_ctxdma (struct ttm_buffer_object *bo, -struct nouveau_channel *chan,struct ttm_mem_reg *reg) +struct nouveau_channel *chan,struct ttm_resource *reg) {if (reg->mem_type ==TTM_PL_TT )return NvDmaTT;
@@ -45,7 +45,7 @@ nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,int nv04_bo_move_m2mf (struct nouveau_channel *chan,struct ttm_buffer_object *bo, -struct ttm_mem_reg *old_reg,struct ttm_mem_reg *new_reg) +struct ttm_resource *old_reg,struct ttm_resource *new_reg) {struct nvif_push *push = chan->chan.push;u32 src_ctxdma =nouveau_bo_mem_ctxdma (bo, chan, old_reg);
drivers/gpu/drm/nouveau/nouveau_bo5039.c +1 -1
@@ -37,7 +37,7 @@int nv50_bo_move_m2mf (struct nouveau_channel *chan,struct ttm_buffer_object *bo, -struct ttm_mem_reg *old_reg,struct ttm_mem_reg *new_reg) +struct ttm_resource *old_reg,struct ttm_resource *new_reg) {struct nouveau_mem *mem =nouveau_mem (old_reg);struct nvif_push *push = chan->chan.push;
drivers/gpu/drm/nouveau/nouveau_bo74c1.c +1 -1
@@ -34,7 +34,7 @@int nv84_bo_move_exec (struct nouveau_channel *chan,struct ttm_buffer_object *bo, -struct ttm_mem_reg *old_reg,struct ttm_mem_reg *new_reg) +struct ttm_resource *old_reg,struct ttm_resource *new_reg) {struct nouveau_mem *mem =nouveau_mem (old_reg);struct nvif_push *push = chan->chan.push;
drivers/gpu/drm/nouveau/nouveau_bo85b5.c +1 -1
@@ -38,7 +38,7 @@int nva3_bo_move_copy (struct nouveau_channel *chan,struct ttm_buffer_object *bo, -struct ttm_mem_reg *old_reg,struct ttm_mem_reg *new_reg) +struct ttm_resource *old_reg,struct ttm_resource *new_reg) {struct nouveau_mem *mem =nouveau_mem (old_reg);struct nvif_push *push = chan->chan.push;
drivers/gpu/drm/nouveau/nouveau_bo9039.c +1 -1
@@ -36,7 +36,7 @@int nvc0_bo_move_m2mf (struct nouveau_channel *chan,struct ttm_buffer_object *bo, -struct ttm_mem_reg *old_reg,struct ttm_mem_reg *new_reg) +struct ttm_resource *old_reg,struct ttm_resource *new_reg) {struct nvif_push *push = chan->chan.push;struct nouveau_mem *mem =nouveau_mem (old_reg);
drivers/gpu/drm/nouveau/nouveau_bo90b5.c +1 -1
@@ -31,7 +31,7 @@int nvc0_bo_move_copy (struct nouveau_channel *chan,struct ttm_buffer_object *bo, -struct ttm_mem_reg *old_reg,struct ttm_mem_reg *new_reg) +struct ttm_resource *old_reg,struct ttm_resource *new_reg) {struct nouveau_mem *mem =nouveau_mem (old_reg);struct nvif_push *push = chan->chan.push;
drivers/gpu/drm/nouveau/nouveau_boa0b5.c +1 -1
@@ -36,7 +36,7 @@int nve0_bo_move_copy (struct nouveau_channel *chan,struct ttm_buffer_object *bo, -struct ttm_mem_reg *old_reg,struct ttm_mem_reg *new_reg) +struct ttm_resource *old_reg,struct ttm_resource *new_reg) {struct nouveau_mem *mem =nouveau_mem (old_reg);struct nvif_push *push = chan->chan.push;
drivers/gpu/drm/nouveau/nouveau_drv.h +1 -1
@@ -157,7 +157,7 @@ struct nouveau_drm {atomic_t validate_sequence;int (*move)(struct nouveau_channel *,struct ttm_buffer_object *, -struct ttm_mem_reg *,struct ttm_mem_reg *); +struct ttm_resource *,struct ttm_resource *);struct nouveau_channel *chan;struct nvif_object copy;int mtrr;
drivers/gpu/drm/nouveau/nouveau_mem.c +4 -4
@@ -92,7 +92,7 @@ nouveau_mem_fini(struct nouveau_mem *mem) }int -nouveau_mem_host (struct ttm_mem_reg *reg,struct ttm_dma_tt *tt) +nouveau_mem_host (struct ttm_resource *reg,struct ttm_dma_tt *tt) {struct nouveau_mem *mem =nouveau_mem (reg);struct nouveau_cli *cli = mem->cli;
@@ -130,7 +130,7 @@ nouveau_mem_host(struct ttm_mem_reg *reg, struct ttm_dma_tt *tt) }int -nouveau_mem_vram (struct ttm_mem_reg *reg,bool contig,u8 page) +nouveau_mem_vram (struct ttm_resource *reg,bool contig,u8 page) {struct nouveau_mem *mem =nouveau_mem (reg);struct nouveau_cli *cli = mem->cli;
@@ -173,7 +173,7 @@ nouveau_mem_vram(struct ttm_mem_reg *reg, bool contig, u8 page) }void -nouveau_mem_del (struct ttm_mem_reg *reg) +nouveau_mem_del (struct ttm_resource *reg) {struct nouveau_mem *mem =nouveau_mem (reg);nouveau_mem_fini (mem);
@@ -183,7 +183,7 @@ nouveau_mem_del(struct ttm_mem_reg *reg)int nouveau_mem_new (struct nouveau_cli *cli,u8 kind,u8 comp, -struct ttm_mem_reg *reg) +struct ttm_resource *reg) {struct nouveau_mem *mem;
drivers/gpu/drm/nouveau/nouveau_mem.h +5 -5
@@ -7,7 +7,7 @@ struct ttm_dma_tt;#include <nvif/vmm.h> static inline struct nouveau_mem * -nouveau_mem (struct ttm_mem_reg *reg) +nouveau_mem (struct ttm_resource *reg) {return reg->mm_node; }
@@ -21,10 +21,10 @@ struct nouveau_mem { };int nouveau_mem_new (struct nouveau_cli *,u8 kind,u8 comp, -struct ttm_mem_reg *); -void nouveau_mem_del (struct ttm_mem_reg *); -int nouveau_mem_vram (struct ttm_mem_reg *,bool contig,u8 page); -int nouveau_mem_host (struct ttm_mem_reg *,struct ttm_dma_tt *); +struct ttm_resource *); +void nouveau_mem_del (struct ttm_resource *); +int nouveau_mem_vram (struct ttm_resource *,bool contig,u8 page); +int nouveau_mem_host (struct ttm_resource *,struct ttm_dma_tt *);void nouveau_mem_fini (struct nouveau_mem *);int nouveau_mem_map (struct nouveau_mem *,struct nvif_vmm *,struct nvif_vma *);#endif
drivers/gpu/drm/nouveau/nouveau_sgdma.c +2 -2
@@ -26,7 +26,7 @@ nouveau_sgdma_destroy(struct ttm_tt *ttm) }static int -nv04_sgdma_bind (struct ttm_tt *ttm,struct ttm_mem_reg *reg) +nv04_sgdma_bind (struct ttm_tt *ttm,struct ttm_resource *reg) {struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;struct nouveau_mem *mem =nouveau_mem (reg);
@@ -60,7 +60,7 @@ static struct ttm_backend_func nv04_sgdma_backend = { };static int -nv50_sgdma_bind (struct ttm_tt *ttm,struct ttm_mem_reg *reg) +nv50_sgdma_bind (struct ttm_tt *ttm,struct ttm_resource *reg) {struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;struct nouveau_mem *mem =nouveau_mem (reg);
drivers/gpu/drm/nouveau/nouveau_ttm.c +4 -4
@@ -32,7 +32,7 @@#include <core/tegra.h> static void -nouveau_manager_del (struct ttm_resource_manager *man,struct ttm_mem_reg *reg) +nouveau_manager_del (struct ttm_resource_manager *man,struct ttm_resource *reg) {nouveau_mem_del (reg); }
@@ -41,7 +41,7 @@ static int nouveau_vram_manager_new(struct ttm_resource_manager *man, struct ttm_buffer_object *bo, const struct ttm_place *place, - struct ttm_mem_reg *reg) + struct ttm_resource *reg) { struct nouveau_bo *nvbo = nouveau_bo(bo);struct nouveau_drm *drm =nouveau_bdev (bo->bdev);
@@ -72,7 +72,7 @@ static int nouveau_gart_manager_new(struct ttm_resource_manager *man, struct ttm_buffer_object *bo, const struct ttm_place *place, - struct ttm_mem_reg *reg) + struct ttm_resource *reg) { struct nouveau_bo *nvbo = nouveau_bo(bo);struct nouveau_drm *drm =nouveau_bdev (bo->bdev);
@@ -95,7 +95,7 @@ static int nv04_gart_manager_new(struct ttm_resource_manager *man, struct ttm_buffer_object *bo, const struct ttm_place *place, - struct ttm_mem_reg *reg) + struct ttm_resource *reg) { struct nouveau_bo *nvbo = nouveau_bo(bo);struct nouveau_drm *drm =nouveau_bdev (bo->bdev);
drivers/gpu/drm/nouveau/nv17_fence.c +1 -1
@@ -78,7 +78,7 @@ nv17_fence_context_new(struct nouveau_channel *chan) {struct nv10_fence_priv *priv = chan->drm->fence;struct nv10_fence_chan *fctx; -struct ttm_mem_reg *reg = &priv->bo->bo.mem; +struct ttm_resource *reg = &priv->bo->bo.mem;u32 start = reg->start *PAGE_SIZE ;u32 limit = start + reg->size -1 ;int ret =0 ;
drivers/gpu/drm/nouveau/nv50_fence.c +1 -1
@@ -37,7 +37,7 @@ nv50_fence_context_new(struct nouveau_channel *chan) {struct nv10_fence_priv *priv = chan->drm->fence;struct nv10_fence_chan *fctx; -struct ttm_mem_reg *reg = &priv->bo->bo.mem; +struct ttm_resource *reg = &priv->bo->bo.mem;u32 start = reg->start *PAGE_SIZE ;u32 limit = start + reg->size -1 ;int ret;
drivers/gpu/drm/qxl/qxl_drv.h +1 -1
@@ -350,7 +350,7 @@ int qxl_mode_dumb_mmap(struct drm_file *filp,int qxl_ttm_init (struct qxl_device *qdev);void qxl_ttm_fini (struct qxl_device *qdev);int qxl_ttm_io_mem_reserve (struct ttm_bo_device *bdev, -struct ttm_mem_reg *mem); +struct ttm_resource *mem);/* qxl image */
drivers/gpu/drm/qxl/qxl_ttm.c +7 -7
@@ -71,7 +71,7 @@ static void qxl_evict_flags(struct ttm_buffer_object *bo, }int qxl_ttm_io_mem_reserve (struct ttm_bo_device *bdev, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct qxl_device *qdev =qxl_get_qdev (bdev);
@@ -111,7 +111,7 @@ struct qxl_ttm_tt { };static int qxl_ttm_backend_bind (struct ttm_tt *ttm, -struct ttm_mem_reg *bo_mem) +struct ttm_resource *bo_mem) {struct qxl_ttm_tt *gtt = (void *)ttm;
@@ -163,9 +163,9 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo, }static void qxl_move_null (struct ttm_buffer_object *bo, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) { -struct ttm_mem_reg *old_mem = &bo->mem; +struct ttm_resource *old_mem = &bo->mem;BUG_ON (old_mem->mm_node !=NULL ); *old_mem = *new_mem;
@@ -174,9 +174,9 @@ static void qxl_move_null(struct ttm_buffer_object *bo,static int qxl_bo_move (struct ttm_buffer_object *bo,bool evict,struct ttm_operation_ctx *ctx, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) { -struct ttm_mem_reg *old_mem = &bo->mem; +struct ttm_resource *old_mem = &bo->mem;int ret; ret =ttm_bo_wait (bo, ctx->interruptible, ctx->no_wait_gpu);
@@ -192,7 +192,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict,static void qxl_bo_move_notify (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct qxl_bo *qbo;struct qxl_device *qdev;
drivers/gpu/drm/radeon/radeon.h +1 -1
@@ -2857,7 +2857,7 @@ int radeon_vm_clear_invalids(struct radeon_device *rdev, struct radeon_vm *vm);int radeon_vm_bo_update (struct radeon_device *rdev,struct radeon_bo_va *bo_va, -struct ttm_mem_reg *mem); +struct ttm_resource *mem);void radeon_vm_bo_invalidate (struct radeon_device *rdev,struct radeon_bo *bo); struct radeon_bo_va *radeon_vm_bo_find(struct radeon_vm *vm,
drivers/gpu/drm/radeon/radeon_object.c +1 -1
@@ -775,7 +775,7 @@ int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,void radeon_bo_move_notify (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct radeon_bo *rbo;
drivers/gpu/drm/radeon/radeon_object.h +1 -1
@@ -165,7 +165,7 @@ extern int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved, bool force_drop);extern void radeon_bo_move_notify (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *new_mem); +struct ttm_resource *new_mem);extern int radeon_bo_fault_reserve_notify (struct ttm_buffer_object *bo);extern int radeon_bo_get_surface_reg (struct radeon_bo *bo); extern void radeon_bo_fence(struct radeon_bo *bo, struct radeon_fence *fence,
drivers/gpu/drm/radeon/radeon_ttm.c +14 -14
@@ -166,9 +166,9 @@ static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp) }static void radeon_move_null (struct ttm_buffer_object *bo, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) { -struct ttm_mem_reg *old_mem = &bo->mem; +struct ttm_resource *old_mem = &bo->mem;BUG_ON (old_mem->mm_node !=NULL ); *old_mem = *new_mem;
@@ -177,8 +177,8 @@ static void radeon_move_null(struct ttm_buffer_object *bo,static int radeon_move_blit (struct ttm_buffer_object *bo,bool evict,bool no_wait_gpu, -struct ttm_mem_reg *new_mem, -struct ttm_mem_reg *old_mem) +struct ttm_resource *new_mem, +struct ttm_resource *old_mem) {struct radeon_device *rdev;uint64_t old_start, new_start;
@@ -233,11 +233,11 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,static int radeon_move_vram_ram (struct ttm_buffer_object *bo,bool evict,bool interruptible,bool no_wait_gpu, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu }; -struct ttm_mem_reg *old_mem = &bo->mem; -struct ttm_mem_reg tmp_mem; +struct ttm_resource *old_mem = &bo->mem; +struct ttm_resource tmp_mem;struct ttm_place placements;struct ttm_placement placement;int r;
@@ -278,11 +278,11 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,static int radeon_move_ram_vram (struct ttm_buffer_object *bo,bool evict,bool interruptible,bool no_wait_gpu, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct ttm_operation_ctx ctx = { interruptible, no_wait_gpu }; -struct ttm_mem_reg *old_mem = &bo->mem; -struct ttm_mem_reg tmp_mem; +struct ttm_resource *old_mem = &bo->mem; +struct ttm_resource tmp_mem;struct ttm_placement placement;struct ttm_place placements;int r;
@@ -315,11 +315,11 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo,static int radeon_bo_move (struct ttm_buffer_object *bo,bool evict,struct ttm_operation_ctx *ctx, -struct ttm_mem_reg *new_mem) +struct ttm_resource *new_mem) {struct radeon_device *rdev;struct radeon_bo *rbo; -struct ttm_mem_reg *old_mem = &bo->mem; +struct ttm_resource *old_mem = &bo->mem;int r; r =ttm_bo_wait (bo, ctx->interruptible, ctx->no_wait_gpu);
@@ -376,7 +376,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,return 0 ; } -static int radeon_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_mem_reg *mem) +static int radeon_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_resource *mem) {struct radeon_device *rdev =radeon_get_rdev (bdev);
@@ -544,7 +544,7 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm) }static int radeon_ttm_backend_bind (struct ttm_tt *ttm, -struct ttm_mem_reg *bo_mem) +struct ttm_resource *bo_mem) {struct radeon_ttm_tt *gtt = (void *)ttm; uint32_t flags = RADEON_GART_PAGE_VALID | RADEON_GART_PAGE_READ |
drivers/gpu/drm/radeon/radeon_vm.c +1 -1
@@ -911,7 +911,7 @@ static void radeon_vm_fence_pts(struct radeon_vm *vm,*/ int radeon_vm_bo_update (struct radeon_device *rdev,struct radeon_bo_va *bo_va, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct radeon_vm *vm = bo_va->vm;struct radeon_ib ib;
drivers/gpu/drm/ttm/ttm_agp_backend.c +1 -1
@@ -48,7 +48,7 @@ struct ttm_agp_backend {struct agp_bridge_data *bridge; }; -static int ttm_agp_bind (struct ttm_tt *ttm,struct ttm_mem_reg *bo_mem) +static int ttm_agp_bind (struct ttm_tt *ttm,struct ttm_resource *bo_mem) { struct ttm_agp_backend *agp_be = container_of(ttm, struct ttm_agp_backend, ttm);struct page *dummy_read_page = ttm_bo_glob.dummy_read_page;
drivers/gpu/drm/ttm/ttm_bo.c +13 -13
@@ -145,7 +145,7 @@ static inline uint32_t ttm_bo_type_flags(unsigned type) }static void ttm_bo_add_mem_to_lru (struct ttm_buffer_object *bo, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct ttm_bo_device *bdev = bo->bdev;struct ttm_resource_manager *man;
@@ -268,7 +268,7 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)EXPORT_SYMBOL (ttm_bo_bulk_move_lru_tail);static int ttm_bo_handle_move_mem (struct ttm_buffer_object *bo, -struct ttm_mem_reg *mem,bool evict, +struct ttm_resource *mem,bool evict,struct ttm_operation_ctx *ctx) {struct ttm_bo_device *bdev = bo->bdev;
@@ -642,7 +642,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx) {struct ttm_bo_device *bdev = bo->bdev; -struct ttm_mem_reg evict_mem; +struct ttm_resource evict_mem;struct ttm_placement placement;int ret =0 ;
@@ -841,7 +841,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,static int ttm_bo_mem_get (struct ttm_buffer_object *bo,const struct ttm_place *place, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct ttm_resource_manager *man =ttm_manager_type (bo->bdev, mem->mem_type);
@@ -852,7 +852,7 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo,return man->func->get_node (man, bo, place, mem); } -void ttm_bo_mem_put (struct ttm_buffer_object *bo,struct ttm_mem_reg *mem) +void ttm_bo_mem_put (struct ttm_buffer_object *bo,struct ttm_resource *mem) {struct ttm_resource_manager *man =ttm_manager_type (bo->bdev, mem->mem_type);
@@ -870,7 +870,7 @@ EXPORT_SYMBOL(ttm_bo_mem_put);*/ static int ttm_bo_add_move_fence (struct ttm_buffer_object *bo,struct ttm_resource_manager *man, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,bool no_wait_gpu) {struct dma_fence *fence;
@@ -907,7 +907,7 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,*/ static int ttm_bo_mem_force_space (struct ttm_buffer_object *bo,const struct ttm_place *place, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,struct ttm_operation_ctx *ctx) {struct ttm_bo_device *bdev = bo->bdev;
@@ -988,7 +988,7 @@ static bool ttm_bo_mt_compatible(struct ttm_resource_manager *man,*/ static int ttm_bo_mem_placement (struct ttm_buffer_object *bo,const struct ttm_place *place, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,struct ttm_operation_ctx *ctx) {struct ttm_bo_device *bdev = bo->bdev;
@@ -1036,7 +1036,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,*/ int ttm_bo_mem_space (struct ttm_buffer_object *bo,struct ttm_placement *placement, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,struct ttm_operation_ctx *ctx) {struct ttm_bo_device *bdev = bo->bdev;
@@ -1114,7 +1114,7 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx) {int ret =0 ; -struct ttm_mem_reg mem; +struct ttm_resource mem;dma_resv_assert_held (bo->base.resv);
@@ -1140,7 +1140,7 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo,static bool ttm_bo_places_compat (const struct ttm_place *places,unsigned num_placement, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,uint32_t *new_flags) {unsigned i;
@@ -1163,7 +1163,7 @@ static bool ttm_bo_places_compat(const struct ttm_place *places, }bool ttm_bo_mem_compat (struct ttm_placement *placement, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,uint32_t *new_flags) { if (ttm_bo_places_compat(placement->placement, placement->num_placement,
@@ -1732,7 +1732,7 @@ int ttm_bo_swapout(struct ttm_bo_global *glob, struct ttm_operation_ctx *ctx)if (bo->mem.mem_type !=TTM_PL_SYSTEM || bo->ttm->caching_state != tt_cached) {struct ttm_operation_ctx ctx = { false, false }; -struct ttm_mem_reg evict_mem; +struct ttm_resource evict_mem; evict_mem = bo->mem; evict_mem.mm_node =NULL ;
drivers/gpu/drm/ttm/ttm_bo_util.c +23 -23
144 lines not on this page · raw message
drivers/gpu/drm/ttm/ttm_range_manager.c +2 -2
@@ -57,7 +57,7 @@ static inline struct ttm_range_manager *to_range_manager(struct ttm_resource_manstatic int ttm_range_man_get_node (struct ttm_resource_manager *man,struct ttm_buffer_object *bo,const struct ttm_place *place, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct ttm_range_manager *rman =to_range_manager (man);struct drm_mm *mm = &rman->mm;
@@ -96,7 +96,7 @@ static int ttm_range_man_get_node(struct ttm_resource_manager *man, }static void ttm_range_man_put_node (struct ttm_resource_manager *man, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct ttm_range_manager *rman =to_range_manager (man);
drivers/gpu/drm/ttm/ttm_tt.c +1 -1
@@ -316,7 +316,7 @@ void ttm_tt_unbind(struct ttm_tt *ttm) } } -int ttm_tt_bind (struct ttm_tt *ttm,struct ttm_mem_reg *bo_mem, +int ttm_tt_bind (struct ttm_tt *ttm,struct ttm_resource *bo_mem,struct ttm_operation_ctx *ctx) {int ret =0 ;
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +2 -2
@@ -1135,14 +1135,14 @@ void vmw_bo_swap_notify(struct ttm_buffer_object *bo)* vmw_bo_move_notify - TTM move_notify_callback * * @bo: The TTM buffer object about to move. -* @mem: The struct ttm_mem_reg indicating to what memory +* @mem: The struct ttm_resource indicating to what memory * region the move is taking place. * * Detaches cached maps and device bindings that require that the * buffer doesn't move. */ void vmw_bo_move_notify (struct ttm_buffer_object *bo, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct vmw_buffer_object *vbo;
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +2 -2
@@ -793,7 +793,7 @@ extern void vmw_resource_unreserve(struct vmw_resource *res,struct vmw_buffer_object *new_backup, unsigned long new_backup_offset);extern void vmw_query_move_notify (struct ttm_buffer_object *bo, -struct ttm_mem_reg *mem); +struct ttm_resource *mem);extern int vmw_query_readback_all (struct vmw_buffer_object *dx_query_mob);extern void vmw_resource_evict_all (struct vmw_private *dev_priv);extern void vmw_resource_unbind_list (struct vmw_buffer_object *vbo);
@@ -878,7 +878,7 @@ extern void vmw_bo_fence_single(struct ttm_buffer_object *bo,extern void *vmw_bo_map_and_cache (struct vmw_buffer_object *vbo);extern void vmw_bo_unmap (struct vmw_buffer_object *vbo);extern void vmw_bo_move_notify (struct ttm_buffer_object *bo, -struct ttm_mem_reg *mem); +struct ttm_resource *mem);extern void vmw_bo_swap_notify (struct ttm_buffer_object *bo);extern struct vmw_buffer_object *vmw_user_bo_noref_lookup (struct ttm_object_file *tfile,u32 handle);
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +2 -2
@@ -53,7 +53,7 @@ static struct vmwgfx_gmrid_man *to_gmrid_manager(struct ttm_resource_manager *mastatic int vmw_gmrid_man_get_node (struct ttm_resource_manager *man,struct ttm_buffer_object *bo,const struct ttm_place *place, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct vmwgfx_gmrid_man *gman =to_gmrid_manager (man);int id;
@@ -85,7 +85,7 @@ static int vmw_gmrid_man_get_node(struct ttm_resource_manager *man, }static void vmw_gmrid_man_put_node (struct ttm_resource_manager *man, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct vmwgfx_gmrid_man *gman =to_gmrid_manager (man);
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +1 -1
@@ -855,7 +855,7 @@ int vmw_query_readback_all(struct vmw_buffer_object *dx_query_mob)* states from the device. */ void vmw_query_move_notify (struct ttm_buffer_object *bo, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct vmw_buffer_object *dx_query_mob;struct ttm_bo_device *bdev = bo->bdev;
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +3 -3
@@ -29,7 +29,7 @@ static struct vmw_thp_manager *to_thp_manager(struct ttm_resource_manager *man)static int vmw_thp_insert_aligned (struct drm_mm *mm,struct drm_mm_node *node,unsigned long align_pages,const struct ttm_place *place, -struct ttm_mem_reg *mem, +struct ttm_resource *mem,unsigned long lpfn,enum drm_mm_insert_mode mode) {
@@ -47,7 +47,7 @@ static int vmw_thp_insert_aligned(struct drm_mm *mm, struct drm_mm_node *node,static int vmw_thp_get_node (struct ttm_resource_manager *man,struct ttm_buffer_object *bo,const struct ttm_place *place, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct vmw_thp_manager *rman =to_thp_manager (man);struct drm_mm *mm = &rman->mm;
@@ -107,7 +107,7 @@ static int vmw_thp_get_node(struct ttm_resource_manager *man,static void vmw_thp_put_node (struct ttm_resource_manager *man, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {struct vmw_thp_manager *rman =to_thp_manager (man);
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +4 -4
@@ -539,7 +539,7 @@ const struct vmw_sg_table *vmw_bo_sg_table(struct ttm_buffer_object *bo) } -static int vmw_ttm_bind (struct ttm_tt *ttm,struct ttm_mem_reg *bo_mem) +static int vmw_ttm_bind (struct ttm_tt *ttm,struct ttm_resource *bo_mem) {struct vmw_ttm_tt *vmw_be = container_of(ttm, struct vmw_ttm_tt, dma_ttm.ttm);
@@ -711,7 +711,7 @@ static int vmw_verify_access(struct ttm_buffer_object *bo, struct file *filp)return vmw_user_bo_verify_access (bo, tfile); } -static int vmw_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_mem_reg *mem) +static int vmw_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_resource *mem) { struct vmw_private *dev_priv = container_of(bdev, struct vmw_private, bdev);
@@ -741,7 +741,7 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg* vmw_move_notify - TTM move_notify_callback * * @bo: The TTM buffer object about to move. -* @mem: The struct ttm_mem_reg indicating to what memory +* @mem: The struct ttm_resource indicating to what memory * region the move is taking place. * * Calls move_notify for all subsystems needing it.
@@ -749,7 +749,7 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg*/ static void vmw_move_notify (struct ttm_buffer_object *bo,bool evict, -struct ttm_mem_reg *mem) +struct ttm_resource *mem) {vmw_bo_move_notify (bo, mem);vmw_query_move_notify (bo, mem);
include/drm/ttm/ttm_bo_api.h +5 -5
@@ -81,7 +81,7 @@ struct ttm_bus_placement {/** -* struct ttm_mem_reg +* struct ttm_resource * * @mm_node: Memory manager node. * @size: Requested size of memory region.
@@ -94,7 +94,7 @@ struct ttm_bus_placement {* buffer object. */ -struct ttm_mem_reg { +struct ttm_resource {void *mm_node;unsigned long start;unsigned long size;
@@ -187,7 +187,7 @@ struct ttm_buffer_object {* Members protected by the bo::resv::reserved lock. */ -struct ttm_mem_reg mem; +struct ttm_resource mem;struct file *persistent_swap_storage;struct ttm_tt *ttm;bool evicted;
@@ -316,12 +316,12 @@ int ttm_bo_wait(struct ttm_buffer_object *bo, bool interruptible, bool no_wait);* ttm_bo_mem_compat - Check if proposed placement is compatible with a bo * * @placement: Return immediately if buffer is busy. -* @mem: The struct ttm_mem_reg indicating the region where the bo resides +* @mem: The struct ttm_resource indicating the region where the bo resides * @new_flags: Describes compatible placement found * * Returns true if the placement is compatible */ -bool ttm_bo_mem_compat (struct ttm_placement *placement,struct ttm_mem_reg *mem, +bool ttm_bo_mem_compat (struct ttm_placement *placement,struct ttm_resource *mem,uint32_t *new_flags);/**
include/drm/ttm/ttm_bo_driver.h +21 -21
153 lines not on this page · raw message
include/drm/ttm/ttm_tt.h +5 -5
@@ -30,7 +30,7 @@#include <linux/types.h> struct ttm_tt ; -struct ttm_mem_reg ; +struct ttm_resource ;struct ttm_buffer_object ;struct ttm_operation_ctx ;
@@ -53,14 +53,14 @@ struct ttm_backend_func {* struct ttm_backend_func member bind * * @ttm: Pointer to a struct ttm_tt. -* @bo_mem: Pointer to a struct ttm_mem_reg describing the +* @bo_mem: Pointer to a struct ttm_resource describing the * memory type and location for binding. * * Bind the backend pages into the aperture in the location * indicated by @bo_mem. This function should be able to handle * differences between aperture and system page sizes. */ -int (*bind) (struct ttm_tt *ttm,struct ttm_mem_reg *bo_mem); +int (*bind) (struct ttm_tt *ttm,struct ttm_resource *bo_mem);/** * struct ttm_backend_func member unbind
@@ -179,11 +179,11 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma);* ttm_ttm_bind: * * @ttm: The struct ttm_tt containing backing pages. -* @bo_mem: The struct ttm_mem_reg identifying the binding location. +* @bo_mem: The struct ttm_resource identifying the binding location. * * Bind the pages of @ttm to an aperture location identified by @bo_mem */ -int ttm_tt_bind (struct ttm_tt *ttm,struct ttm_mem_reg *bo_mem, +int ttm_tt_bind (struct ttm_tt *ttm,struct ttm_resource *bo_mem,struct ttm_operation_ctx *ctx);/**
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 41/59 drm/radeon/ttm: use wrapper to access memory manager
In reply to Dave AirlieFrom: 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
@@ -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
@@ -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
Dave Airlie
maintainerQuoted 3 lines · Dave Airlie
I've decided to repost the whole queue this time, it has a few driver patches up front that are just cleanups.
Sample branch is
https://cgit.freedesktop.org/~airlied/linux/log/?h=ttm-refactor-mem-manager-rename
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 07/59] drm/vram-helper: remove populate/unpopulate
In reply to Dave AirlieAm 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.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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
Re: [PATCH 12/59] drm/vram-helper: call the ttm manager debug function
In reply to Dave AirlieAm 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_mmhere, don't do that call the correct API.v2: use the new exported interface.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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
Re: [PATCH 18/59] drm/vram_helper: use new ttm manager init function
In reply to Dave AirlieAm 04.08.20 um 04:55 schrieb Dave Airlie:
Quoted 3 lines
From: Dave Airlie <[email protected]>
Signed-off-by 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@@ -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
Re: [PATCH 29/59] drm/vram_helper: call explicit mm takedown
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 3 lines
From: Dave Airlie <[email protected]>
Signed-off-by 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@@ -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
Re: [PATCH 38/59] drm/vram-helper: use wrapper to access memory managers
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 3 lines
From: Dave Airlie <[email protected]>
Signed-off-by 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@@ -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
Re: [PATCH 05/59] drm/ttm/amdgpu: consolidate ttm reserve paths
In reply to Dave AirlieAm 04.08.20 um 04:55 schrieb Dave Airlie:
Quoted 7 lines
From: Dave Airlie <[email protected]>
Drop the
WARN_ONand consolidate the two paths into one.Use the consolidate slowpath in the execbuf utils code.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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@@ -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
Re: [PATCH 06/59] drm/ttm: use a helper for unlocked moves to the lru tail
In reply to Dave AirlieAm 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.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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@@ -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
Re: [PATCH 08/59] drm/ttm: export memory type debug entrypoint.
In reply to Dave AirlieAm 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.)
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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
Re: [PATCH 04/59] qxl/ttm: drop the unusued no wait flag to reserve function
In reply to Dave AirlieQuoted 3 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Signed-off-by Dave Airlie <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 11/59] drm/qxl/ttm: call ttm manager debug (v2)
In reply to Dave AirlieQuoted 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 adrm_mmat 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
Re: [PATCH 12/59] drm/vram-helper: call the ttm manager debug function
In reply to Dave AirlieQuoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
This code was assuming there was a
drm_mmhere, 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
Re: [PATCH 17/59] drm/qxl/ttm: use new init path for manager
In reply to Dave AirlieQuoted 3 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Signed-off-by Dave Airlie <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 18/59] drm/vram_helper: use new ttm manager init function
In reply to Dave AirlieQuoted 3 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Signed-off-by Dave Airlie <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 32/59] drm/qxl/ttm: use new takedown path
In reply to Dave AirlieQuoted 3 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Signed-off-by Dave Airlie <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 40/59] drm/qxl/ttm: use wrapper to access memory manager
In reply to Dave AirlieQuoted 3 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Signed-off-by Dave Airlie <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 13/59] drm/ttm: split the mm manager init code (v2)
In reply to Dave AirlieAm 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)Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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@@ -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
Christian König
maintainerRe: [PATCH 13/59] drm/ttm: split the mm manager init code (v2)
In reply to Dave AirlieAm 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)Signed-off-by Dave Airlie <[email protected]>--- 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@@ -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@@ -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@@ -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
Re: [PATCH 15/59] drm/amdgpu/ttm: init managers from the driver side.
In reply to Dave AirlieAm 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
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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@@ -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@@ -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
Re: [PATCH 16/59] drm/radeon: use new ttm man init path
In reply to Dave AirlieAm 04.08.20 um 04:55 schrieb Dave Airlie:
Quoted 5 lines
From: Dave Airlie <[email protected]>
Use the new common manager init path.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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
Re: [PATCH 25/59] drm/ttm: make some inline helper functions for cleanup paths. (v2)
In reply to Dave AirlieAm 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_typeis gone in a later patch.v2: add docs.
rename tottm_mem_type_managernamespaceSigned-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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
Re: [PATCH 26/59] drm/ttm: start allowing drivers to use new takedown path (v2)
In reply to Dave AirlieAm 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
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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_debuginclude/drm/ttm/ttm_bo_driver.h +23
-0@@ -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
Re: [PATCH 36/59] drm/ttm: add wrapper to get manager from bdev.
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 5 lines
From: Dave Airlie <[email protected]>
This will allow different abstractions later.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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@@ -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@@ -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
Re: [PATCH 37/59] drm/amdgfx/ttm: use wrapper to get ttm memory managers
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 3 lines
From: Dave Airlie <[email protected]>
Signed-off-by 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@@ -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@@ -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@@ -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@@ -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@@ -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_filemin (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_fileatomic64_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@@ -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@@ -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@@ -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
Re: [PATCH 41/59] drm/radeon/ttm: use wrapper to access memory manager
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 3 lines
From: Dave Airlie <[email protected]>
Signed-off-by 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@@ -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@@ -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
Re: [PATCH 43/59] drm/ttm: rename manager variable to make sure wrapper is used.
In reply to Dave AirlieAm 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.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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
Re: [PATCH 44/59] drm/ttm: allow drivers to provide their own manager subclasses
In reply to Dave AirlieAm 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.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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
Christian König
maintainerRe: [PATCH 45/59] drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 4 lines
From: Dave Airlie <[email protected]>
Reviewed-by Christian König <[email protected]>Signed-off-by 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@@ -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@@ -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
Re: [PATCH 46/59] drm/ttm: make ttm_range_man_init/takedown take type + args
In reply to Dave AirlieAm 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
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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
Re: [PATCH 54/59] drm/ttm: drop list of memory managers from device. (v2)
In reply to Dave AirlieAm 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.
Signed-off-by Dave Airlie <[email protected]>
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@@ -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@@ -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
Re: [PATCH 55/59] drm/ttm: drop type manager has_type
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 7 lines
From: Dave Airlie <[email protected]>
under driver control, this flag isn't needed anymore, remove the API that used to access it, and consoldiate with the used api.
Signed-off-by Dave Airlie <[email protected]>
Quoted 180 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 | 4 ++-- drivers/gpu/drm/ttm/ttm_bo.c | 8 +++----- 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_driver.h | 17 ----------------- 8 files changed, 10 insertions(+), 29 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +1
-1@@ -146,7 +146,7 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man);int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (&adev->mman.bdev, man);if (ret)drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1
-1@@ -223,7 +223,7 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (&adev->mman.bdev, man);if (ret)drivers/gpu/drm/nouveau/nouveau_ttm.c +2
-2@@ -194,7 +194,7 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)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); +ttm_mem_type_manager_set_used (man, false);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 );@@ -253,7 +253,7 @@ nouveau_ttm_fini_gtt(struct nouveau_drm *drm) drm->agp.bridge) ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_TT); else { -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false);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 );drivers/gpu/drm/ttm/ttm_bo.c +3
-5@@ -80,7 +80,6 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place,void ttm_mem_type_manager_debug (struct ttm_mem_type_manager *man,struct drm_printer *p) { -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);@@ -1003,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,return ret; man =ttm_manager_type (bdev, mem_type); -if (!man->has_type || !man->use_type) +if (!man || !man->use_type)return -EBUSY ;if (!ttm_bo_mt_compatible (man, mem_type, place, &cur_flags))@@ -1462,7 +1461,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)return -EINVAL ; } -if (!man->has_type) { +if (!man) {pr_err ("Memory type %u has not been initialized\n" , mem_type);return 0 ; }@@ -1476,7 +1475,6 @@ void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man, {unsigned i; -BUG_ON (man->has_type); man->use_io_reserve_lru = false;mutex_init (&man->io_reserve_mutex);spin_lock_init (&man->move_lock);@@ -1557,7 +1555,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)struct ttm_mem_type_manager *man; man =ttm_manager_type (bdev,TTM_PL_SYSTEM ); -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false);ttm_set_driver_manager (bdev,TTM_PL_SYSTEM ,NULL );mutex_lock (&ttm_global_mutex);drivers/gpu/drm/ttm/ttm_bo_manager.c +1
-1@@ -152,7 +152,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,struct drm_mm *mm = &rman->mm;int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (bdev, man);if (ret)drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1
-1@@ -143,7 +143,7 @@ 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 =to_gmrid_manager (man); -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false);ttm_mem_type_manager_force_list_clean (&dev_priv->bdev, man);drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +1
-1@@ -152,7 +152,7 @@ void vmw_thp_fini(struct vmw_private *dev_priv)struct drm_mm *mm = &rman->mm;int ret; -ttm_mem_type_manager_disable (man); +ttm_mem_type_manager_set_used (man, false); ret =ttm_mem_type_manager_force_list_clean (&dev_priv->bdev, man);if (ret)include/drm/ttm/ttm_bo_driver.h +0
-10@@ -111,7 +111,6 @@ struct ttm_mem_type_manager_func {/** * struct ttm_mem_type_manager * -* @has_type: The memory type has been initialized. * @use_type: The memory type is enabled. * @flags: TTM_MEMTYPE_XX flags identifying the traits of the memory * managed by this memory type. @@ -141,8 +140,6 @@ struct ttm_mem_type_manager {/* * No protection. Constant from start. */ - -bool has_type;bool use_type;bool use_tt;uint64_t size;@@ -678,23 +675,9 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)*/ 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_mem_type_manager_disable. -* -* @man: A memory manager object. -* -* Indicate the manager is not to be used and deregistered. (temporary during rework).
include/drm/ttm/ttm_bo_driver.h static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo) · line 683
Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +0
-7-*/ -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 *
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 56/59] drm/ttm: add a wrapper for checking if manager is in use
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 6 lines
From: Dave Airlie <[email protected]>
This converts vmwgfx over to using an interface to set the in use and check the in use flag.
Signed-off-by Dave Airlie <[email protected]>
Quoted 94 lines
--- drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 - drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 14 +++++++------- include/drm/ttm/ttm_bo_driver.h | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 9 deletions(-)drivers/gpu/drm/nouveau/nouveau_ttm.c +0
-1@@ -240,7 +240,6 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)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); -return 0 ; }drivers/gpu/drm/ttm/ttm_bo.c +1
-1@@ -1002,7 +1002,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,return ret; man =ttm_manager_type (bdev, mem_type); -if (!man || !man->use_type) +if (!man || !ttm_mem_type_manager_used (man))return -EBUSY ;if (!ttm_bo_mt_compatible (man, mem_type, place, &cur_flags))drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +7
-7@@ -630,7 +630,7 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)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; +ttm_mem_type_manager_set_used (ttm_manager_type (&dev_priv->bdev,TTM_PL_VRAM ), false);return ret; }@@ -1192,9 +1192,9 @@ 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 (!man->use_type) { +if (!ttm_mem_type_manager_used (man)) {vmw_write (dev_priv,SVGA_REG_ENABLE ,SVGA_REG_ENABLE ); - man->use_type = true; +ttm_mem_type_manager_set_used (man, true); }spin_unlock (&dev_priv->svga_lock); }@@ -1223,8 +1223,8 @@ 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 (man->use_type) { - man->use_type = false; +if (ttm_mem_type_manager_used (man)) { +ttm_mem_type_manager_set_used (man, false);vmw_write (dev_priv,SVGA_REG_ENABLE ,SVGA_REG_ENABLE_HIDE |SVGA_REG_ENABLE_ENABLE );@@ -1257,8 +1257,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 (man->use_type) { - man->use_type = false; +if (ttm_mem_type_manager_used (man)) { +ttm_mem_type_manager_set_used (man, 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" );include/drm/ttm/ttm_bo_driver.h +7
-0@@ -678,6 +678,20 @@ static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma man->use_type = used; } +/** +* ttm_mem_type_manager_used +* +* @man: Manager to get used state for +* +* Get the in use flag for a manager. +* Returns:
include/drm/ttm/ttm_bo_driver.h static inline void ttm_mem_type_manager_set_used(struct ttm_mem_type_manager *ma · line 697
Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7
-0+* true is used, false if not. +*/ +static inline bool ttm_mem_type_manager_used (struct ttm_mem_type_manager *man) +{ +return man->use_type; +} +/** * ttm_mem_type_manager_cleanup *
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 57/59] drm/ttm: rename bo manager to range manager.
In reply to Dave AirlieAm 04.08.20 um 04:56 schrieb Dave Airlie:
Quoted 6 lines
From: Dave Airlie <[email protected]>
The generic manager is called the range manager now, rename the file and some internals.
Signed-off-by Dave Airlie <[email protected]>
Quoted 82 lines
--- drivers/gpu/drm/ttm/Makefile | 2 +- .../{ttm_bo_manager.c => ttm_range_manager.c} | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-)rename
drivers/gpu/drm/ttm/{ttm_bo_manager.c=>ttm_range_manager.c} (88%)drivers/gpu/drm/ttm/Makefile +1
-1@@ -4,7 +4,7 @@ ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ - ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o + ttm_execbuf_util.o ttm_page_alloc.o ttm_range_manager.o ttm-$(CONFIG_AGP) += ttm_agp_backend.o ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.odrivers/gpu/drm/ttm/ttm_range_manager.c renamed from drivers/gpu/drm/ttm/ttm_bo_manager.c +9
-9@@ -54,10 +54,10 @@ static inline struct ttm_range_manager *to_range_manager(struct ttm_mem_type_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) +static int ttm_range_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 =to_range_manager (man);struct drm_mm *mm = &rman->mm;@@ -95,8 +95,8 @@ static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,return ret; } -static void ttm_bo_man_put_node (struct ttm_mem_type_manager *man, -struct ttm_mem_reg *mem) +static void ttm_range_man_put_node (struct ttm_mem_type_manager *man, +struct ttm_mem_reg *mem) {struct ttm_range_manager *rman =to_range_manager (man);@@ -110,7 +110,7 @@ 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; +static const struct ttm_mem_type_manager_func ttm_range_manager_func; int ttm_range_man_init(struct ttm_bo_device *bdev, unsigned type,@@ -131,7 +131,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev, man->default_caching = default_caching; man->use_tt = use_tt; - man->func = &ttm_bo_manager_func; + man->func = &ttm_range_manager_func;ttm_mem_type_manager_init (man, p_size);@@ -170,7 +170,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev, }EXPORT_SYMBOL (ttm_range_man_fini); -static void ttm_bo_man_debug (struct ttm_mem_type_manager *man, +static void ttm_range_man_debug (struct ttm_mem_type_manager *man,struct drm_printer *printer) {struct ttm_range_manager *rman =to_range_manager (man);@@ -180,8 +180,8 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,spin_unlock (&rman->lock); }
drivers/gpu/drm/ttm/ttm_range_manager.c static void ttm_bo_man_debug(struct ttm_mem_type_manager *man, · line 187
Quoted 10 lines
drivers/gpu/drm/ttm/ttm_range_manager.c renamed from drivers/gpu/drm/ttm/ttm_bo_manager.c +4
-4-static const struct ttm_mem_type_manager_func ttm_bo_manager_func = { - .get_node = ttm_bo_man_get_node, - .put_node = ttm_bo_man_put_node, - .debug = ttm_bo_man_debug +static const struct ttm_mem_type_manager_func ttm_range_manager_func = { + .get_node = ttm_range_man_get_node, + .put_node = ttm_range_man_put_node, + .debug = ttm_range_man_debug };
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel