drm/amdgpu: do not pass ttm_resource_manager to gtt_mgr
Subsystems (3)
PATCH 1/4 drm/amdgpu: do not pass ttm_resource_manager to gtt_mgr
Do not allow exported amdgpu_gtt_mgr_*() to accept any ttm_resource_manager pointer. Also there is no need to force other module to call a ttm function just to eventually call gtt_mgr functions.
v4: remove unused adev.
v3: upcast mgr from ttm resopurce manager instead of getting it from adev.
v2: pass adev's gtt_mgr instead of adev.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 22 ++++++++++----------- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ++-- 4 files changed, 16 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -2
@@ -4357,7 +4357,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 (ttm_manager_type (&adev->mman.bdev,TTM_PL_TT )); +amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr); r =amdgpu_device_fw_loading (adev);if (r)
@@ -4677,7 +4677,7 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle,amdgpu_inc_vram_lost (tmp_adev); } - r =amdgpu_gtt_mgr_recover (ttm_manager_type (&tmp_adev->mman.bdev,TTM_PL_TT )); + r =amdgpu_gtt_mgr_recover (&tmp_adev->mman.gtt_mgr);if (r) goto out;
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +10 -12
@@ -77,10 +77,8 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); -struct ttm_resource_manager *man; - man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT ); -return sysfs_emit (buf,"%llu\n" ,amdgpu_gtt_mgr_usage (man)); +return sysfs_emit (buf,"%llu\n" ,amdgpu_gtt_mgr_usage (&adev->mman.gtt_mgr)); } static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
@@ -206,14 +204,15 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,/** * amdgpu_gtt_mgr_usage - return usage of GTT domain * -* @man: TTM memory type manager +* @mgr: amdgpu_gtt_mgr pointer * * Return how many bytes are used in the GTT domain */ -uint64_t amdgpu_gtt_mgr_usage (struct ttm_resource_manager *man) +uint64_t amdgpu_gtt_mgr_usage (struct amdgpu_gtt_mgr *mgr) { -struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man); -s64 result = man->size -atomic64_read (&mgr->available); +s64 result; + + result = mgr->manager.size -atomic64_read (&mgr->available);return (result >0 ? result :0 ) *PAGE_SIZE ; }
@@ -221,16 +220,15 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man)/** * amdgpu_gtt_mgr_recover - re-init gart * -* @man: TTM memory type manager +* @mgr: amdgpu_gtt_mgr pointer * * Re-init the gart for each known BO in the GTT. */ -int amdgpu_gtt_mgr_recover (struct ttm_resource_manager *man) +int amdgpu_gtt_mgr_recover (struct amdgpu_gtt_mgr *mgr) { -struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man); -struct amdgpu_device *adev;struct amdgpu_gtt_node *node;struct drm_mm_node *mm_node; +struct amdgpu_device *adev;int r =0 ; adev =container_of (mgr,typeof (*adev), mman.gtt_mgr);
@@ -267,7 +265,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man,drm_printf (printer,"man size:%llu pages, gtt available:%lld pages, usage:%lluMB\n" , man->size, (u64 )atomic64_read (&mgr->available), -amdgpu_gtt_mgr_usage (man) >>20 ); +amdgpu_gtt_mgr_usage (mgr) >>20 ); }static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = {
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +2 -2
@@ -678,7 +678,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 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 (ttm_manager_type (&adev->mman.bdev,TTM_PL_TT )); + ui64 =amdgpu_gtt_mgr_usage (&adev->mman.gtt_mgr);return copy_to_user (out, &ui64,min (size,8u )) ? -EFAULT :0 ;case AMDGPU_INFO_GDS_CONFIG : {struct drm_amdgpu_info_gds gds_info;
@@ -738,7 +738,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) mem.gtt.usable_heap_size = mem.gtt.total_heap_size -atomic64_read (&adev->gart_pin_size); mem.gtt.heap_usage = -amdgpu_gtt_mgr_usage (gtt_man); +amdgpu_gtt_mgr_usage (&adev->mman.gtt_mgr); mem.gtt.max_allocation = mem.gtt.usable_heap_size *3 /4 ; return copy_to_user(out, &mem,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +2 -2
@@ -114,8 +114,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_resource *mem); -uint64_t amdgpu_gtt_mgr_usage (struct ttm_resource_manager *man); -int amdgpu_gtt_mgr_recover (struct ttm_resource_manager *man); +uint64_t amdgpu_gtt_mgr_usage (struct amdgpu_gtt_mgr *mgr); +int amdgpu_gtt_mgr_recover (struct amdgpu_gtt_mgr *mgr);uint64_t amdgpu_preempt_mgr_usage (struct ttm_resource_manager *man);
Signature · 1 line
2.33.1
PATCH 2/4 drm/amdkfd: remove unused function
Remove unused amdgpu_amdkfd_get_vram_usage()
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 ------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 - 2 files changed, 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +0 -7
@@ -514,13 +514,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd,return r; } -uint64_t amdgpu_amdkfd_get_vram_usage (struct amdgpu_device *adev) -{ -struct ttm_resource_manager *vram_man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); - -return amdgpu_vram_mgr_usage (vram_man); -} -uint8_t amdgpu_amdkfd_get_xgmi_hops_count (struct amdgpu_device *dst,struct amdgpu_device *src) {
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0 -1
@@ -223,7 +223,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd, uint64_t *bo_size, void *metadata_buffer, size_t buffer_size, uint32_t *metadata_size, uint32_t *flags); -uint64_t amdgpu_amdkfd_get_vram_usage (struct amdgpu_device *adev);uint8_t amdgpu_amdkfd_get_xgmi_hops_count (struct amdgpu_device *dst,struct amdgpu_device *src); int amdgpu_amdkfd_get_xgmi_bandwidth_mbytes(struct amdgpu_device *dst,
--
2.33.1
Re: [PATCH 2/4] drm/amdkfd: remove unused function
Found the commit that removed usages of this function.
Quoted 43 lines · Nirmoy Das
Remove unused
amdgpu_amdkfd_get_vram_usage()Signed-off-by Nirmoy Das <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 ------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 - 2 files changed, 8 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +0
-7@@ -514,13 +514,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd,return r; } -uint64_t amdgpu_amdkfd_get_vram_usage (struct amdgpu_device *adev) -{ -struct ttm_resource_manager *vram_man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); - -return amdgpu_vram_mgr_usage (vram_man); -} -uint8_t amdgpu_amdkfd_get_xgmi_hops_count (struct amdgpu_device *dst,struct amdgpu_device *src) {drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0
-2@@ -223,7 +223,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd, uint64_t *bo_size, void *metadata_buffer, size_t buffer_size, uint32_t *metadata_size, uint32_t *flags); -uint64_t amdgpu_amdkfd_get_vram_usage (struct amdgpu_device *adev);uint8_t amdgpu_amdkfd_get_xgmi_hops_count (struct amdgpu_device *dst,struct amdgpu_device *src); int amdgpu_amdkfd_get_xgmi_bandwidth_mbytes(struct amdgpu_device *dst, --2.33.1
Re: [PATCH 2/4] drm/amdkfd: remove unused function
I think this is still used on the DKMS branch. But it's fine upstream. Thanks for catching this.
Regards,
Felix
Am 2022-01-07 um 5:18 a.m. schrieb Nirmoy:
Quoted 54 lines
Found the commit that removed usages of this function.
Fixes dfcbe6d5f ("drm/amdgpu: Remove unused function pointers")Quoted 48 lines · Nirmoy Das
Remove unused
amdgpu_amdkfd_get_vram_usage()Signed-off-by Nirmoy Das <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c| 7 -------drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h| 1 -2 files changed, 8 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +0
-7@@ -514,13 +514,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd, return r; } -uint64_t amdgpu_amdkfd_get_vram_usage (struct amdgpu_device *adev) -{ - struct ttm_resource_manager *vram_man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); - - return amdgpu_vram_mgr_usage(vram_man); -} - uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct amdgpu_device *dst,struct
amdgpu_device*src) {drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0
-1@@ -223,7 +223,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd, uint64_t *bo_size, void *metadata_buffer, size_t buffer_size, uint32_t *metadata_size, uint32_t *flags); -uint64_t amdgpu_amdkfd_get_vram_usage (struct amdgpu_device *adev); uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct amdgpu_device *dst, struct amdgpu_device *src);int amdgpu_amdkfd_get_xgmi_bandwidth_mbytes(struct
amdgpu_device*dst,Signature · 1 line
2.33.1
PATCH 3/4 drm/amdgpu: do not pass ttm_resource_manager to vram_mgr
In reply to Nirmoy DasDo not allow exported amdgpu_vram_mgr_*() to accept any ttm_resource_manager pointer. Also there is no need to force other module to call a ttm function just to eventually call vram_mgr functions.
v2: pass adev's vram_mgr instead of adev
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 6 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 5 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 40 ++++++++------------ 6 files changed, 30 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -3
@@ -298,7 +298,6 @@ 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_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. *
@@ -315,7 +314,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 (vram_man); + used_vram =amdgpu_vram_mgr_usage (&adev->mman.vram_mgr); free_vram = used_vram >= total_vram ?0 : total_vram - used_vram;spin_lock (&adev->mm_stats.lock);
@@ -362,7 +361,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 (vram_man); +amdgpu_vram_mgr_vis_usage (&adev->mman.vram_mgr);if (used_vis_vram < total_vis_vram) {u64 free_vis_vram = total_vis_vram - used_vis_vram;
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +4 -6
@@ -672,10 +672,10 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 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 (ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM )); + ui64 =amdgpu_vram_mgr_usage (&adev->mman.vram_mgr);return copy_to_user (out, &ui64,min (size,8u )) ? -EFAULT :0 ;case AMDGPU_INFO_VIS_VRAM_USAGE : - ui64 =amdgpu_vram_mgr_vis_usage (ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM )); + ui64 =amdgpu_vram_mgr_vis_usage (&adev->mman.vram_mgr);return copy_to_user (out, &ui64,min (size,8u )) ? -EFAULT :0 ;case AMDGPU_INFO_GTT_USAGE : ui64 =amdgpu_gtt_mgr_usage (&adev->mman.gtt_mgr);
@@ -709,8 +709,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) }case AMDGPU_INFO_MEMORY : {struct drm_amdgpu_memory_info mem; -struct ttm_resource_manager *vram_man = -ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM );struct ttm_resource_manager *gtt_man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT );memset (&mem,0 ,sizeof (mem));
@@ -719,7 +717,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)atomic64_read (&adev->vram_pin_size) -AMDGPU_VM_RESERVED_VRAM ; mem.vram.heap_usage = -amdgpu_vram_mgr_usage (vram_man); +amdgpu_vram_mgr_usage (&adev->mman.vram_mgr); mem.vram.max_allocation = mem.vram.usable_heap_size *3 /4 ; mem.cpu_accessible_vram.total_heap_size =
@@ -729,7 +727,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)atomic64_read (&adev->visible_pin_size), mem.vram.usable_heap_size); mem.cpu_accessible_vram.heap_usage = -amdgpu_vram_mgr_vis_usage (vram_man); +amdgpu_vram_mgr_vis_usage (&adev->mman.vram_mgr); mem.cpu_accessible_vram.max_allocation = mem.cpu_accessible_vram.usable_heap_size *3 /4 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2 -4
@@ -1839,8 +1839,7 @@ static int amdgpu_ras_badpages_read(struct amdgpu_device *adev, .size = AMDGPU_GPU_PAGE_SIZE, .flags = AMDGPU_RAS_RETIRE_PAGE_RESERVED, }; - status =amdgpu_vram_mgr_query_page_status ( -ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ), + status =amdgpu_vram_mgr_query_page_status (&adev->mman.vram_mgr, data->bps[i].retired_page);if (status == -EBUSY ) (*bps)[i].flags =AMDGPU_RAS_RETIRE_PAGE_PENDING ;
@@ -1941,8 +1940,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev, goto out; } -amdgpu_vram_mgr_reserve_range ( -ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ), +amdgpu_vram_mgr_reserve_range (&adev->mman.vram_mgr, bps[i].retired_page <<AMDGPU_GPU_PAGE_SHIFT ,AMDGPU_GPU_PAGE_SIZE );
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +4 -4
@@ -129,11 +129,11 @@ int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev,void amdgpu_vram_mgr_free_sgt (struct device *dev,enum dma_data_direction dir,struct sg_table *sgt); -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_vram_mgr_reserve_range (struct ttm_resource_manager *man, +uint64_t amdgpu_vram_mgr_usage (struct amdgpu_vram_mgr *mgr); +uint64_t amdgpu_vram_mgr_vis_usage (struct amdgpu_vram_mgr *mgr); +int amdgpu_vram_mgr_reserve_range (struct amdgpu_vram_mgr *mgr,uint64_t start,uint64_t size); -int amdgpu_vram_mgr_query_page_status (struct ttm_resource_manager *man, +int amdgpu_vram_mgr_query_page_status (struct amdgpu_vram_mgr *mgr,uint64_t start);int amdgpu_ttm_init (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +2 -3
@@ -553,7 +553,6 @@ static void amdgpu_virt_populate_vf2pf_ucode_info(struct amdgpu_device *adev)static int amdgpu_virt_write_vf2pf_data (struct amdgpu_device *adev) {struct amd_sriov_msg_vf2pf_info *vf2pf_info; -struct ttm_resource_manager *vram_man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); vf2pf_info = (struct amd_sriov_msg_vf2pf_info *) adev->virt.fw_reserve.p_vf2pf;
@@ -576,8 +575,8 @@ static int amdgpu_virt_write_vf2pf_data(struct amdgpu_device *adev) vf2pf_info->driver_cert =0 ; vf2pf_info->os_info.all =0 ; - vf2pf_info->fb_usage =amdgpu_vram_mgr_usage (vram_man) >>20 ; - vf2pf_info->fb_vis_usage =amdgpu_vram_mgr_vis_usage (vram_man) >>20 ; + vf2pf_info->fb_usage =amdgpu_vram_mgr_usage (&adev->mman.vram_mgr) >>20 ; + vf2pf_info->fb_vis_usage =amdgpu_vram_mgr_vis_usage (&adev->mman.vram_mgr) >>20 ; vf2pf_info->fb_size = adev->gmc.real_vram_size >>20 ; vf2pf_info->fb_vis_size = adev->gmc.visible_vram_size >>20 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +16 -24
@@ -96,10 +96,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 =drm_to_adev (ddev); -struct ttm_resource_manager *man; - man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); -return sysfs_emit (buf,"%llu\n" ,amdgpu_vram_mgr_usage (man)); +return sysfs_emit (buf,"%llu\n" , +amdgpu_vram_mgr_usage (&adev->mman.vram_mgr)); }/**
@@ -116,10 +115,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 =drm_to_adev (ddev); -struct ttm_resource_manager *man; - man =ttm_manager_type (&adev->mman.bdev,TTM_PL_VRAM ); -return sysfs_emit (buf,"%llu\n" ,amdgpu_vram_mgr_vis_usage (man)); +return sysfs_emit (buf,"%llu\n" , +amdgpu_vram_mgr_vis_usage (&adev->mman.vram_mgr)); }/**
@@ -263,16 +261,15 @@ static void amdgpu_vram_mgr_do_reserve(struct ttm_resource_manager *man)/** * amdgpu_vram_mgr_reserve_range - Reserve a range from VRAM * -* @man: TTM memory type manager +* @mgr: amdgpu_vram_mgr pointer * @start: start address of the range in VRAM * @size: size of the range * -* Reserve memory from start addess with the specified size in VRAM +* Reserve memory from start address with the specified size in VRAM */ -int amdgpu_vram_mgr_reserve_range (struct ttm_resource_manager *man, +int amdgpu_vram_mgr_reserve_range (struct amdgpu_vram_mgr *mgr,uint64_t start,uint64_t size) { -struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);struct amdgpu_vram_reservation *rsv; rsv =kzalloc (sizeof (*rsv),GFP_KERNEL );
@@ -285,7 +282,7 @@ int amdgpu_vram_mgr_reserve_range(struct ttm_resource_manager *man,spin_lock (&mgr->lock);list_add_tail (&mgr->reservations_pending, &rsv->node); -amdgpu_vram_mgr_do_reserve (man); +amdgpu_vram_mgr_do_reserve (&mgr->manager);spin_unlock (&mgr->lock);return 0 ;
@@ -294,7 +291,7 @@ int amdgpu_vram_mgr_reserve_range(struct ttm_resource_manager *man,/** * amdgpu_vram_mgr_query_page_status - query the reservation status * -* @man: TTM memory type manager +* @mgr: amdgpu_vram_mgr pointer * @start: start address of a page in VRAM * * Returns:
@@ -302,10 +299,9 @@ int amdgpu_vram_mgr_reserve_range(struct ttm_resource_manager *man,* 0: the page has been reserved * -ENOENT: the input page is not a reservation */ -int amdgpu_vram_mgr_query_page_status (struct ttm_resource_manager *man, +int amdgpu_vram_mgr_query_page_status (struct amdgpu_vram_mgr *mgr,uint64_t start) { -struct amdgpu_vram_mgr *mgr =to_vram_mgr (man);struct amdgpu_vram_reservation *rsv;int ret;
@@ -632,28 +628,24 @@ void amdgpu_vram_mgr_free_sgt(struct device *dev,/** * amdgpu_vram_mgr_usage - how many bytes are used in this domain * -* @man: TTM memory type manager +* @mgr: amdgpu_vram_mgr pointer * * Returns how many bytes are used in this domain. */ -uint64_t amdgpu_vram_mgr_usage (struct ttm_resource_manager *man) +uint64_t amdgpu_vram_mgr_usage (struct amdgpu_vram_mgr *mgr) { -struct amdgpu_vram_mgr *mgr =to_vram_mgr (man); -return atomic64_read (&mgr->usage); }/** * amdgpu_vram_mgr_vis_usage - how many bytes are used in the visible part * -* @man: TTM memory type manager +* @mgr: amdgpu_vram_mgr pointer * * Returns how many bytes are used in the visible part of VRAM */ -uint64_t amdgpu_vram_mgr_vis_usage (struct ttm_resource_manager *man) +uint64_t amdgpu_vram_mgr_vis_usage (struct amdgpu_vram_mgr *mgr) { -struct amdgpu_vram_mgr *mgr =to_vram_mgr (man); -return atomic64_read (&mgr->vis_usage); }
@@ -675,8 +667,8 @@ static void amdgpu_vram_mgr_debug(struct ttm_resource_manager *man,spin_unlock (&mgr->lock);drm_printf (printer,"man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n" , - man->size,amdgpu_vram_mgr_usage (man) >>20 , -amdgpu_vram_mgr_vis_usage (man) >>20 ); + man->size,amdgpu_vram_mgr_usage (mgr) >>20 , +amdgpu_vram_mgr_vis_usage (mgr) >>20 ); }static const struct ttm_resource_manager_func amdgpu_vram_mgr_func = {
Signature · 1 line
2.33.1
PATCH 4/4 drm/amdgpu: recover gart table at resume
In reply to Nirmoy DasGet rid off pin/unpin of gart BO at resume/suspend and instead pin only once and try to recover gart content at resume time. This is much more stable in case there is OOM situation at 2nd call to amdgpu_device_evict_resources() while evicting GART table.
v3: remove gart recovery from other places
v2: pin gart at amdgpu_gart_table_vram_alloc()
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 --- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 84 ++-------------------- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +- 7 files changed, 11 insertions(+), 99 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -11
@@ -4004,16 +4004,11 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)if (!adev->in_s0ix)amdgpu_amdkfd_suspend (adev, adev->in_runpm); -/* First evict vram memory */ amdgpu_device_evict_resources (adev);amdgpu_fence_driver_hw_fini (adev);amdgpu_device_ip_suspend_phase2 (adev); -/* This second call to evict device resources is to evict -* the gart page table using the CPU. -*/ -amdgpu_device_evict_resources (adev);return 0 ; }
@@ -4356,8 +4351,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, goto error;amdgpu_virt_init_data_exchange (adev); -/* we need recover gart prior to run SMC/CP/SDMA resume */ -amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr); r =amdgpu_device_fw_loading (adev);if (r)
@@ -4677,10 +4670,6 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle,amdgpu_inc_vram_lost (tmp_adev); } - r =amdgpu_gtt_mgr_recover (&tmp_adev->mman.gtt_mgr); -if (r) - goto out; - r =amdgpu_device_fw_loading (tmp_adev);if (r)return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +6 -78
97 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +1 -2
@@ -989,7 +989,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev)if (amdgpu_sriov_vf (adev) &&amdgpu_in_reset (adev)) goto skip_pin_bo; - r =amdgpu_gart_table_vram_pin (adev); + r =amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr);if (r)return r;
@@ -1060,7 +1060,6 @@ static void gmc_v10_0_gart_disable(struct amdgpu_device *adev) { adev->gfxhub.funcs->gart_disable (adev); adev->mmhub.funcs->gart_disable (adev); -amdgpu_gart_table_vram_unpin (adev); }static int gmc_v10_0_hw_fini (void *handle)
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1 -2
@@ -476,7 +476,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; } - r =amdgpu_gart_table_vram_pin (adev); + r =amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr);if (r)return r;
@@ -608,7 +608,6 @@ static void gmc_v6_0_gart_disable(struct amdgpu_device *adev)WREG32 (mmVM_L2_CNTL3,VM_L2_CNTL3__L2_CACHE_BIGK_ASSOCIATIVITY_MASK | (0UL <<VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT )); -amdgpu_gart_table_vram_unpin (adev); } static void gmc_v6_0_vm_decode_fault(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -2
@@ -620,7 +620,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; } - r =amdgpu_gart_table_vram_pin (adev); + r =amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr);if (r)return r;
@@ -758,7 +758,6 @@ static void gmc_v7_0_gart_disable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 );WREG32 (mmVM_L2_CNTL, tmp);WREG32 (mmVM_L2_CNTL2,0 ); -amdgpu_gart_table_vram_unpin (adev); }/**
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1 -2
@@ -844,7 +844,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)dev_err (adev->dev,"No VRAM object for PCIE GART.\n" );return -EINVAL ; } - r =amdgpu_gart_table_vram_pin (adev); + r =amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr);if (r)return r;
@@ -999,7 +999,6 @@ static void gmc_v8_0_gart_disable(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,VM_L2_CNTL ,ENABLE_L2_CACHE ,0 );WREG32 (mmVM_L2_CNTL, tmp);WREG32 (mmVM_L2_CNTL2,0 ); -amdgpu_gart_table_vram_unpin (adev); }/**
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -2
@@ -1743,7 +1743,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)if (amdgpu_sriov_vf (adev) &&amdgpu_in_reset (adev)) goto skip_pin_bo; - r =amdgpu_gart_table_vram_pin (adev); + r =amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr);if (r)return r;
@@ -1821,7 +1821,6 @@ static void gmc_v9_0_gart_disable(struct amdgpu_device *adev) { adev->gfxhub.funcs->gart_disable (adev); adev->mmhub.funcs->gart_disable (adev); -amdgpu_gart_table_vram_unpin (adev); }static int gmc_v9_0_hw_fini (void *handle)
Signature · 1 line
2.33.1
Christian König
maintainerI've just pushed the whole set to amd-staging-drm-next.
Thanks,
Christian.
Am 07.01.22 um 09:51 schrieb Nirmoy Das:
Quoted 143 lines
Do not allow exported amdgpu_gtt_mgr_*() to accept any
ttm_resource_managerpointer. Also there is no need to force other module to call a ttm function just to eventually callgtt_mgrfunctions.v4: remove unused adev.
v3: upcast mgr from ttm resopurce manager instead of getting it from adev.
v2: pass adev'sgtt_mgrinstead of adev.Reviewed-by Christian König <[email protected]>Signed-off-by Nirmoy Das <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 22 ++++++++++----------- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ++-- 4 files changed, 16 insertions(+), 18 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-2@@ -4357,7 +4357,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 (ttm_manager_type (&adev->mman.bdev,TTM_PL_TT )); +amdgpu_gtt_mgr_recover (&adev->mman.gtt_mgr); r =amdgpu_device_fw_loading (adev);if (r)@@ -4677,7 +4677,7 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle,amdgpu_inc_vram_lost (tmp_adev); } - r =amdgpu_gtt_mgr_recover (ttm_manager_type (&tmp_adev->mman.bdev,TTM_PL_TT )); + r =amdgpu_gtt_mgr_recover (&tmp_adev->mman.gtt_mgr);if (r) goto out;drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +10
-12@@ -77,10 +77,8 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); -struct ttm_resource_manager *man; - man =ttm_manager_type (&adev->mman.bdev,TTM_PL_TT ); -return sysfs_emit (buf,"%llu\n" ,amdgpu_gtt_mgr_usage (man)); +return sysfs_emit (buf,"%llu\n" ,amdgpu_gtt_mgr_usage (&adev->mman.gtt_mgr)); } static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,@@ -206,14 +204,15 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,/** * amdgpu_gtt_mgr_usage - return usage of GTT domain * -* @man: TTM memory type manager +* @mgr: amdgpu_gtt_mgr pointer * * Return how many bytes are used in the GTT domain */ -uint64_t amdgpu_gtt_mgr_usage (struct ttm_resource_manager *man) +uint64_t amdgpu_gtt_mgr_usage (struct amdgpu_gtt_mgr *mgr) { -struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man); -s64 result = man->size -atomic64_read (&mgr->available); +s64 result; + + result = mgr->manager.size -atomic64_read (&mgr->available);return (result >0 ? result :0 ) *PAGE_SIZE ; }@@ -221,16 +220,15 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man)/** * amdgpu_gtt_mgr_recover - re-init gart * -* @man: TTM memory type manager +* @mgr: amdgpu_gtt_mgr pointer * * Re-init the gart for each known BO in the GTT. */ -int amdgpu_gtt_mgr_recover (struct ttm_resource_manager *man) +int amdgpu_gtt_mgr_recover (struct amdgpu_gtt_mgr *mgr) { -struct amdgpu_gtt_mgr *mgr =to_gtt_mgr (man); -struct amdgpu_device *adev;struct amdgpu_gtt_node *node;struct drm_mm_node *mm_node; +struct amdgpu_device *adev;int r =0 ; adev =container_of (mgr,typeof (*adev), mman.gtt_mgr);@@ -267,7 +265,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man,drm_printf (printer,"man size:%llu pages, gtt available:%lld pages, usage:%lluMB\n" , man->size, (u64 )atomic64_read (&mgr->available), -amdgpu_gtt_mgr_usage (man) >>20 ); +amdgpu_gtt_mgr_usage (mgr) >>20 ); }static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = {drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +2
-2@@ -678,7 +678,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 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 (ttm_manager_type (&adev->mman.bdev,TTM_PL_TT )); + ui64 =amdgpu_gtt_mgr_usage (&adev->mman.gtt_mgr);return copy_to_user (out, &ui64,min (size,8u )) ? -EFAULT :0 ;case AMDGPU_INFO_GDS_CONFIG : {struct drm_amdgpu_info_gds gds_info;@@ -738,7 +738,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) mem.gtt.usable_heap_size = mem.gtt.total_heap_size -atomic64_read (&adev->gart_pin_size); mem.gtt.heap_usage = -amdgpu_gtt_mgr_usage (gtt_man); +amdgpu_gtt_mgr_usage (&adev->mman.gtt_mgr); mem.gtt.max_allocation = mem.gtt.usable_heap_size *3 /4 ; return copy_to_user(out, &mem,drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +2
-2@@ -114,8 +114,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_resource *mem); -uint64_t amdgpu_gtt_mgr_usage (struct ttm_resource_manager *man); -int amdgpu_gtt_mgr_recover (struct ttm_resource_manager *man); +uint64_t amdgpu_gtt_mgr_usage (struct amdgpu_gtt_mgr *mgr); +int amdgpu_gtt_mgr_recover (struct amdgpu_gtt_mgr *mgr);uint64_t amdgpu_preempt_mgr_usage (struct ttm_resource_manager *man);