drm: make drm-active- stats optional

When memory stats is generated fresh everytime by going though all the
BOs, their active information is quite easy to get. But if the stats are
tracked with BO's state this becomes harder since the job scheduling
part doesn't really deal with individual buffers.

Make drm-active- optional to enable amdgpu to switch to the second
method.

Signed-off-by: Yunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241219151411.1150-3-Yunxiang.Li@amd.com
Signed-off-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
index df2cf5c..7717e3e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
@@ -97,6 +97,7 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file)
 
                drm_print_memory_stats(p,
                                       &stats[i].drm,
+                                      DRM_GEM_OBJECT_ACTIVE |
                                       DRM_GEM_OBJECT_RESIDENT |
                                       DRM_GEM_OBJECT_PURGEABLE,
                                       pl_name[i]);

diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index f10b693..2289e71 100644 (file)
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@ -870,7 +870,9 @@ void drm_print_memory_stats(struct drm_printer *p,
 {
        print_size(p, "total", region, stats->private + stats->shared);
        print_size(p, "shared", region, stats->shared);
-       print_size(p, "active", region, stats->active);
+
+       if (supported_status & DRM_GEM_OBJECT_ACTIVE)
+               print_size(p, "active", region, stats->active);
 
        if (supported_status & DRM_GEM_OBJECT_RESIDENT)
                print_size(p, "resident", region, stats->resident);
@@ -903,15 +905,13 @@ void drm_show_memory_stats(struct drm_printer *p, struct drm_file *file)
 
                if (obj->funcs && obj->funcs->status) {
                        s = obj->funcs->status(obj);
-                       supported_status = DRM_GEM_OBJECT_RESIDENT |
-                                       DRM_GEM_OBJECT_PURGEABLE;
+                       supported_status |= s;
                }
 
-               if (drm_gem_object_is_shared_for_memory_stats(obj)) {
+               if (drm_gem_object_is_shared_for_memory_stats(obj))
                        status.shared += obj->size;
-               } else {
+               else
                        status.private += obj->size;
-               }
 
                if (s & DRM_GEM_OBJECT_RESIDENT) {
                        status.resident += add_size;
@@ -924,6 +924,7 @@ void drm_show_memory_stats(struct drm_printer *p, struct drm_file *file)
 
                if (!dma_resv_test_signaled(obj->resv, dma_resv_usage_rw(true))) {
                        status.active += add_size;
+                       supported_status |= DRM_GEM_OBJECT_ACTIVE;
 
                        /* If still active, don't count as purgeable: */
                        s &= ~DRM_GEM_OBJECT_PURGEABLE;

diff --git a/drivers/gpu/drm/i915/i915_drm_client.c b/drivers/gpu/drm/i915/i915_drm_client.c
index f586825..168d737 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drm_client.c
+++ b/drivers/gpu/drm/i915/i915_drm_client.c
@@ -102,6 +102,7 @@ static void show_meminfo(struct drm_printer *p, struct drm_file *file)
        for_each_memory_region(mr, i915, id)
                drm_print_memory_stats(p,
                                       &stats[id],
+                                      DRM_GEM_OBJECT_ACTIVE |
                                       DRM_GEM_OBJECT_RESIDENT |
                                       DRM_GEM_OBJECT_PURGEABLE,
                                       mr->uabi_name);

diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c
index 22f0f1a..1436d8f 100644 (file)
--- a/drivers/gpu/drm/xe/xe_drm_client.c
+++ b/drivers/gpu/drm/xe/xe_drm_client.c
@@ -261,6 +261,7 @@ static void show_meminfo(struct drm_printer *p, struct drm_file *file)
                if (man) {
                        drm_print_memory_stats(p,
                                               &stats[mem_type],
+                                              DRM_GEM_OBJECT_ACTIVE |
                                               DRM_GEM_OBJECT_RESIDENT |
                                               (mem_type != XE_PL_SYSTEM ? 0 :
                                               DRM_GEM_OBJECT_PURGEABLE),

diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 5b8b1b0..fdae947 100644 (file)
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -48,19 +48,21 @@ struct drm_gem_object;
  * enum drm_gem_object_status - bitmask of object state for fdinfo reporting
  * @DRM_GEM_OBJECT_RESIDENT: object is resident in memory (ie. not unpinned)
  * @DRM_GEM_OBJECT_PURGEABLE: object marked as purgeable by userspace
+ * @DRM_GEM_OBJECT_ACTIVE: object is currently used by an active submission
  *
  * Bitmask of status used for fdinfo memory stats, see &drm_gem_object_funcs.status
- * and drm_show_fdinfo().  Note that an object can DRM_GEM_OBJECT_PURGEABLE if
- * it still active or not resident, in which case drm_show_fdinfo() will not
+ * and drm_show_fdinfo().  Note that an object can report DRM_GEM_OBJECT_PURGEABLE
+ * and be active or not resident, in which case drm_show_fdinfo() will not
  * account for it as purgeable.  So drivers do not need to check if the buffer
- * is idle and resident to return this bit.  (Ie. userspace can mark a buffer
- * as purgeable even while it is still busy on the GPU.. it does not _actually_
- * become puregeable until it becomes idle.  The status gem object func does
- * not need to consider this.)
+ * is idle and resident to return this bit, i.e. userspace can mark a buffer as
+ * purgeable even while it is still busy on the GPU. It will not get reported in
+ * the puregeable stats until it becomes idle.  The status gem object func does
+ * not need to consider this.
  */
 enum drm_gem_object_status {
        DRM_GEM_OBJECT_RESIDENT  = BIT(0),
        DRM_GEM_OBJECT_PURGEABLE = BIT(1),
+       DRM_GEM_OBJECT_ACTIVE    = BIT(2),
 };
 
 /**