drm/amdgpu: fix gtt mgr available statistics
Subsystems (2)
PATCH 1/3 drm/amdgpu: fix gtt mgr available statistics
gtt_mgr_alloc is called by many places in local driver, while gtt_mgr_new is called by get_node in ttm.
Change-Id Ia5a18a3b531a01ad7d47f40e08f778e7b94c048a
Signed-off-by Chunming Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +5 -6
@@ -124,6 +124,8 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, r =drm_mm_insert_node_in_range_generic (&mgr->mm, node, mem->num_pages, mem->page_alignment,0 , fpfn, lpfn, sflags, aflags); +if (!r) + mgr->available -= mem->num_pages;spin_unlock (&mgr->lock);if (!r) {
@@ -160,7 +162,6 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,spin_unlock (&mgr->lock);return 0 ; } - mgr->available -= mem->num_pages;spin_unlock (&mgr->lock); node =kzalloc (sizeof (*node),GFP_KERNEL );
@@ -187,9 +188,6 @@ static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,return 0 ; err_out: -spin_lock (&mgr->lock); - mgr->available += mem->num_pages; -spin_unlock (&mgr->lock);return r; }
@@ -214,9 +212,10 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,return ;spin_lock (&mgr->lock); -if (node->start !=AMDGPU_BO_INVALID_OFFSET ) +if (node->start !=AMDGPU_BO_INVALID_OFFSET ) {drm_mm_remove_node (node); - mgr->available += mem->num_pages; + mgr->available += mem->num_pages; + }spin_unlock (&mgr->lock);kfree (node);
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1492074127-6317-1-git-send-email-David1.Zhou-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu: add gtt print like vram when dump mm table
Change-Id If0474e24e14d237d2d55731871c5ceb11e5a3601
Signed-off-by Chunming Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +6 -0
@@ -138,6 +138,12 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,return r; } +void amdgpu_gtt_mgr_print (struct seq_file *m,struct ttm_mem_type_manager *man) +{ +struct amdgpu_gtt_mgr *mgr = man->priv; +seq_printf (m,"man size:%llu pages, gtt available:%llu pages\n" , + man->size, mgr->available); +}/** * amdgpu_gtt_mgr_new - allocate a new node *
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4 -0
@@ -1540,6 +1540,8 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,#if defined(CONFIG_DEBUG_FS ) +extern void amdgpu_gtt_mgr_print (struct seq_file *m,struct ttm_mem_type_manager + *man);static int amdgpu_mm_dump_table (struct seq_file *m,void *data) {struct drm_info_node *node = (struct drm_info_node *)m->private;
@@ -1558,6 +1560,8 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data) adev->mman.bdev.man[ttm_pl].size, (u64 )atomic64_read (&adev->vram_usage) >>20 , (u64)atomic64_read(&adev->vram_vis_usage) >> 20); +if (ttm_pl ==TTM_PL_TT ) +amdgpu_gtt_mgr_print (m, &adev->mman.bdev.man[ttm_pl]);return ret; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: move gtt usage statistic to gtt mgr
In reply to a message not in the archiveChange-Id Ifea42c8ae2206143d7e22b35eea537ba9e928fe8
Signed-off-by Chunming Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 13 ++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 ------ 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +10 -3
@@ -97,6 +97,7 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, {struct amdgpu_gtt_mgr *mgr = man->priv;struct drm_mm_node *node = mem->mm_node; +struct amdgpu_device *adev =amdgpu_ttm_adev (man->bdev);enum drm_mm_search_flags sflags =DRM_MM_SEARCH_BEST ;enum drm_mm_allocator_flags aflags =DRM_MM_CREATE_DEFAULT ;unsigned long fpfn, lpfn;
@@ -124,8 +125,10 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, r =drm_mm_insert_node_in_range_generic (&mgr->mm, node, mem->num_pages, mem->page_alignment,0 , fpfn, lpfn, sflags, aflags); -if (!r) +if (!r) { mgr->available -= mem->num_pages; +atomic64_add (mem->size, &adev->gtt_usage); + }spin_unlock (&mgr->lock);if (!r) {
@@ -140,9 +143,11 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,void amdgpu_gtt_mgr_print (struct seq_file *m,struct ttm_mem_type_manager *man) { +struct amdgpu_device *adev =amdgpu_ttm_adev (man->bdev);struct amdgpu_gtt_mgr *mgr = man->priv; -seq_printf (m,"man size:%llu pages, gtt available:%llu pages\n" , - man->size, mgr->available); +seq_printf (m,"man size:%llu pages, gtt available:%llu pages, usage:%lluMB\n" , + man->size, mgr->available, + (u64 )atomic64_read (&adev->gtt_usage) >>20 ); }/** * amdgpu_gtt_mgr_new - allocate a new node
@@ -213,6 +218,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man, {struct amdgpu_gtt_mgr *mgr = man->priv;struct drm_mm_node *node = mem->mm_node; +struct amdgpu_device *adev =amdgpu_ttm_adev (man->bdev);if (!node)return ;
@@ -221,6 +227,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,if (node->start !=AMDGPU_BO_INVALID_OFFSET ) {drm_mm_remove_node (node); mgr->available += mem->num_pages; +atomic64_sub (mem->size, &adev->gtt_usage); }spin_unlock (&mgr->lock);
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -6
@@ -61,9 +61,6 @@ static void amdgpu_update_memory_usage(struct amdgpu_device *adev,if (new_mem) {switch (new_mem->mem_type) { -case TTM_PL_TT : -atomic64_add (new_mem->size, &adev->gtt_usage); -break ;case TTM_PL_VRAM :atomic64_add (new_mem->size, &adev->vram_usage); vis_size =amdgpu_get_vis_part_size (adev, new_mem);
@@ -80,9 +77,6 @@ static void amdgpu_update_memory_usage(struct amdgpu_device *adev,if (old_mem) {switch (old_mem->mem_type) { -case TTM_PL_TT : -atomic64_sub (old_mem->size, &adev->gtt_usage); -break ;case TTM_PL_VRAM :atomic64_sub (old_mem->size, &adev->vram_usage); vis_size =amdgpu_get_vis_part_size (adev, old_mem);
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx