drm/amdgpu: Expose special on chip memory pools in fdinfo

In the past these specialized on chip memory pools were reported as system
memory (aka 'cpu') which was not correct and misleading. That has since
been removed so lets make them visible as their own respective memory
regions.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Yunxiang Li <Yunxiang.Li@amd.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
index 7a95739..df2cf5c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
@@ -66,6 +66,10 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file)
                [TTM_PL_VRAM] = "vram",
                [TTM_PL_TT] = "gtt",
                [TTM_PL_SYSTEM] = "cpu",
+               [AMDGPU_PL_GDS] = "gds",
+               [AMDGPU_PL_GWS] = "gws",
+               [AMDGPU_PL_OA] = "oa",
+               [AMDGPU_PL_DOORBELL] = "doorbell",
        };
        unsigned int hw_ip, i;
        int ret;
@@ -87,12 +91,16 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file)
 
        drm_printf(p, "pasid:\t%u\n", fpriv->vm.pasid);
 
-       for (i = 0; i < TTM_PL_PRIV; i++)
+       for (i = 0; i < ARRAY_SIZE(pl_name); i++) {
+               if (!pl_name[i])
+                       continue;
+
                drm_print_memory_stats(p,
                                       &stats[i].drm,
                                       DRM_GEM_OBJECT_RESIDENT |
                                       DRM_GEM_OBJECT_PURGEABLE,
                                       pl_name[i]);
+       }
 
        /* Legacy amdgpu keys, alias to drm-resident-memory-: */
        drm_printf(p, "drm-memory-vram:\t%llu KiB\n",