[PATCH 37/59] drm/amdgfx/ttm: use wrapper to get ttm memory managers
Christian König
christian.koenig at amd.com
Tue Aug 4 11:26:34 UTC 2020
Am 04.08.20 um 04:56 schrieb Dave Airlie:
> From: Dave Airlie <airlied at redhat.com>
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 1b865fed74ca..e24f421e5553 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -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)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index a512ccbc4dea..9829640e1769 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index aa5b54e5a1d7..d551e7c5e69d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -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;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> index 28056d12b199..f0b78e88bb55 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> @@ -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;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index a8c47aecd342..594687cc99ac 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -594,13 +594,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
> ui64 = atomic64_read(&adev->num_vram_cpu_page_faults);
> return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
> case AMDGPU_INFO_VRAM_USAGE:
> - ui64 = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
> + ui64 = amdgpu_vram_mgr_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM));
> return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
> case AMDGPU_INFO_VIS_VRAM_USAGE:
> - ui64 = amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
> + ui64 = amdgpu_vram_mgr_vis_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM));
> return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
> case AMDGPU_INFO_GTT_USAGE:
> - ui64 = amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
> + ui64 = amdgpu_gtt_mgr_usage(ttm_manager_type(&adev->mman.bdev, TTM_PL_TT));
> return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;
> case AMDGPU_INFO_GDS_CONFIG: {
> struct drm_amdgpu_info_gds gds_info;
> @@ -623,7 +623,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
> min(adev->gmc.visible_vram_size -
> atomic64_read(&adev->visible_pin_size),
> vram_gtt.vram_size);
> - vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size;
> + vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size;
> vram_gtt.gtt_size *= PAGE_SIZE;
> vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size);
> return copy_to_user(out, &vram_gtt,
> @@ -631,14 +631,17 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
> }
> case AMDGPU_INFO_MEMORY: {
> struct drm_amdgpu_memory_info mem;
> -
> + struct ttm_mem_type_manager *vram_man =
> + ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
> + struct ttm_mem_type_manager *gtt_man =
> + ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
> memset(&mem, 0, sizeof(mem));
> mem.vram.total_heap_size = adev->gmc.real_vram_size;
> mem.vram.usable_heap_size = adev->gmc.real_vram_size -
> atomic64_read(&adev->vram_pin_size) -
> AMDGPU_VM_RESERVED_VRAM;
> mem.vram.heap_usage =
> - amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
> + amdgpu_vram_mgr_usage(vram_man);
> mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4;
>
> mem.cpu_accessible_vram.total_heap_size =
> @@ -648,16 +651,16 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
> atomic64_read(&adev->visible_pin_size),
> mem.vram.usable_heap_size);
> mem.cpu_accessible_vram.heap_usage =
> - amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);
> + amdgpu_vram_mgr_vis_usage(vram_man);
> mem.cpu_accessible_vram.max_allocation =
> mem.cpu_accessible_vram.usable_heap_size * 3 / 4;
>
> - mem.gtt.total_heap_size = adev->mman.bdev.man[TTM_PL_TT].size;
> + mem.gtt.total_heap_size = gtt_man->size;
> mem.gtt.total_heap_size *= PAGE_SIZE;
> mem.gtt.usable_heap_size = mem.gtt.total_heap_size -
> atomic64_read(&adev->gart_pin_size);
> mem.gtt.heap_usage =
> - amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);
> + amdgpu_gtt_mgr_usage(gtt_man);
> mem.gtt.max_allocation = mem.gtt.usable_heap_size * 3 / 4;
>
> return copy_to_user(out, &mem,
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 5ac7b5561475..ced418cba2f7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index d7516144bb0a..1bd860877f1e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index c3bc9ddd437e..bc776b8f1063 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -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;
>
More information about the dri-devel
mailing list