drm/amdgpu: make drm-memory-* report resident memory

The old behavior reports the resident memory usage for this key and the
documentation say so as well. However this was accidentally changed to
include buffers that was evicted.

Fixes: 04bdba46542c ("drm/amdgpu: Use drm_print_memory_stats helper from fdinfo")
Signed-off-by: Yunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.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 00a4ab082459f217351c5172480bdc095fdd3f15..8281dd45faaa0feec9e35838786e6fe4a855331c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
@@ -33,6 +33,7 @@
 #include <drm/amdgpu_drm.h>
 #include <drm/drm_debugfs.h>
 #include <drm/drm_drv.h>
+#include <drm/drm_file.h>
 
 #include "amdgpu.h"
 #include "amdgpu_vm.h"
@@ -95,11 +96,11 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file)
 
        /* Legacy amdgpu keys, alias to drm-resident-memory-: */
        drm_printf(p, "drm-memory-vram:\t%llu KiB\n",
-                  stats[TTM_PL_VRAM].total/1024UL);
+                  stats[TTM_PL_VRAM].drm.resident/1024UL);
        drm_printf(p, "drm-memory-gtt: \t%llu KiB\n",
-                  stats[TTM_PL_TT].total/1024UL);
+                  stats[TTM_PL_TT].drm.resident/1024UL);
        drm_printf(p, "drm-memory-cpu: \t%llu KiB\n",
-                  stats[TTM_PL_SYSTEM].total/1024UL);
+                  stats[TTM_PL_SYSTEM].drm.resident/1024UL);
 
        /* Amdgpu specific memory accounting keys: */
        drm_printf(p, "amd-memory-visible-vram:\t%llu KiB\n",

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 1e6a044e3143b7723b158701fe665168029926cb..d41686a8e5ec02758667b8998a58e0caa7679f22 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1224,7 +1224,6 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo,
 
        /* DRM stats common fields: */
 
-       stats[type].total += size;
        if (drm_gem_object_is_shared_for_memory_stats(obj))
                stats[type].drm.shared += size;
        else

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 7260349917ef066d105fa095bf08300ad376839f..a5653f474f85cf421f9934676fa485d72b98211c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -142,7 +142,6 @@ struct amdgpu_bo_vm {
 struct amdgpu_mem_stats {
        struct drm_memory_stats drm;
 
-       uint64_t total;
        uint64_t visible;
        uint64_t evicted;
        uint64_t evicted_visible;