drm/amdgpu: add shared fdinfo stats

From Alex Deucher
f85a55fb87c2ee58e957b9c828aa70306a759d8d in linux-6.6.y/6.6.30
ba1a58d5b907bdf1814f8f57434aebc86233430f in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_fdinfo.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_fdinfo.c
index 298d4ff..663ed49 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_fdinfo.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_fdinfo.c
@@ -107,6 +107,10 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file)
                   stats.requested_visible_vram/1024UL);
        drm_printf(p, "amd-requested-gtt:\t%llu KiB\n",
                   stats.requested_gtt/1024UL);
+       drm_printf(p, "drm-shared-vram:\t%llu KiB\n", stats.vram_shared/1024UL);
+       drm_printf(p, "drm-shared-gtt:\t%llu KiB\n", stats.gtt_shared/1024UL);
+       drm_printf(p, "drm-shared-cpu:\t%llu KiB\n", stats.cpu_shared/1024UL);
+
        for (hw_ip = 0; hw_ip < AMDGPU_HW_IP_NUM; ++hw_ip) {
                if (!usage[hw_ip])
                        continue;

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c
index 46b5d4b..7f566fd 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c
@@ -1303,25 +1303,36 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo,
                          struct amdgpu_mem_stats *stats)
 {
        uint64_t size = amdgpu_bo_size(bo);
+       struct drm_gem_object *obj;
        unsigned int domain;
+       bool shared;
 
        /* Abort if the BO doesn't currently have a backing store */
        if (!bo->tbo.resource)
                return;
 
+       obj = &bo->tbo.base;
+       shared = drm_gem_object_is_shared_for_memory_stats(obj);
+
        domain = amdgpu_mem_type_to_domain(bo->tbo.resource->mem_type);
        switch (domain) {
        case AMDGPU_GEM_DOMAIN_VRAM:
                stats->vram += size;
                if (amdgpu_bo_in_cpu_visible_vram(bo))
                        stats->visible_vram += size;
+               if (shared)
+                       stats->vram_shared += size;
                break;
        case AMDGPU_GEM_DOMAIN_GTT:
                stats->gtt += size;
+               if (shared)
+                       stats->gtt_shared += size;
                break;
        case AMDGPU_GEM_DOMAIN_CPU:
        default:
                stats->cpu += size;
+               if (shared)
+                       stats->cpu_shared += size;
                break;
        }
 

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h
index fa5a92c..887fe0f 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h
@@ -139,12 +139,18 @@ struct amdgpu_bo_vm {
 struct amdgpu_mem_stats {
        /* current VRAM usage, includes visible VRAM */
        uint64_t vram;
+       /* current shared VRAM usage, includes visible VRAM */
+       uint64_t vram_shared;
        /* current visible VRAM usage */
        uint64_t visible_vram;
        /* current GTT usage */
        uint64_t gtt;
+       /* current shared GTT usage */
+       uint64_t gtt_shared;
        /* current system memory usage */
        uint64_t cpu;
+       /* current shared system memory usage */
+       uint64_t cpu_shared;
        /* sum of evicted buffers, includes visible VRAM */
        uint64_t evicted_vram;
        /* sum of evicted buffers due to CPU access */