[PATCH 1/2] drm/amdgpu: add gtt print like vram when dump mm table V2

[Alex Deucher]

On Wed, Apr 19, 2017 at 11:47 PM, Chunming Zhou <David1.Zhou at amd.com> wrote:
> Change-Id: If0474e24e14d237d2d55731871c5ceb11e5a3601
> Signed-off-by: Chunming Zhou <David1.Zhou at amd.com>
> Reviewed-by: Christian König <christian.koenig at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c |  9 +++++++++
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c     | 10 +++++++++-
>  2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> index 69ab2ee..f586cb7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> @@ -136,6 +136,15 @@ 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_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, usage:%lluMB\n",
> +                  man->size, mgr->available, (u64)atomic64_read(&adev->gtt_usage) >> 20);
> +
> +}
>  /**
>   * amdgpu_gtt_mgr_new - allocate a new node
>   *
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index c3112b6..2b402d2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -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;
> @@ -1553,11 +1555,17 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data)
>         spin_lock(&glob->lru_lock);
>         ret = drm_mm_dump_table(m, mm);
>         spin_unlock(&glob->lru_lock);
> -       if (ttm_pl == TTM_PL_VRAM)
> +       switch (ttm_pl) {
> +       case TTM_PL_VRAM:
>                 seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n",
>                            adev->mman.bdev.man[ttm_pl].size,
>                            (u64)atomic64_read(&adev->vram_usage) >> 20,
>                            (u64)atomic64_read(&adev->vram_vis_usage) >> 20);
> +               break;
> +       case TTM_PL_TT:
> +               amdgpu_gtt_mgr_print(m, &adev->mman.bdev.man[TTM_PL_TT]);
> +               break;
> +       }
>         return ret;
>  }
>
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx