drm/file: Add fdinfo helper for printing regions with prefix

This is motivated by the desire of some drivers (eg. Panthor) to print the
size of internal memory regions with a prefix that reflects the driver
name, as suggested in the previous documentation commit.

That means adding a new argument to print_size and making it available for
DRM users.

Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Signed-off-by: Adrián Larumbe <adrian.larumbe@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250130172851.941597-3-adrian.larumbe@collabora.com

diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index 2289e71e2fa24983a01f3911e65f59be402ed559..c299cd94d3f78fec2ac0dbb3d8241569640806d8 100644 (file)
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@ -830,8 +830,11 @@ void drm_send_event(struct drm_device *dev, struct drm_pending_event *e)
 }
 EXPORT_SYMBOL(drm_send_event);
 
-static void print_size(struct drm_printer *p, const char *stat,
-                      const char *region, u64 sz)
+void drm_fdinfo_print_size(struct drm_printer *p,
+                          const char *prefix,
+                          const char *stat,
+                          const char *region,
+                          u64 sz)
 {
        const char *units[] = {"", " KiB", " MiB"};
        unsigned u;
@@ -842,8 +845,10 @@ static void print_size(struct drm_printer *p, const char *stat,
                sz = div_u64(sz, SZ_1K);
        }
 
-       drm_printf(p, "drm-%s-%s:\t%llu%s\n", stat, region, sz, units[u]);
+       drm_printf(p, "%s-%s-%s:\t%llu%s\n",
+                  prefix, stat, region, sz, units[u]);
 }
+EXPORT_SYMBOL(drm_fdinfo_print_size);
 
 int drm_memory_stats_is_zero(const struct drm_memory_stats *stats)
 {
@@ -868,17 +873,22 @@ void drm_print_memory_stats(struct drm_printer *p,
                            enum drm_gem_object_status supported_status,
                            const char *region)
 {
-       print_size(p, "total", region, stats->private + stats->shared);
-       print_size(p, "shared", region, stats->shared);
+       const char *prefix = "drm";
+
+       drm_fdinfo_print_size(p, prefix, "total", region,
+                             stats->private + stats->shared);
+       drm_fdinfo_print_size(p, prefix, "shared", region, stats->shared);
 
        if (supported_status & DRM_GEM_OBJECT_ACTIVE)
-               print_size(p, "active", region, stats->active);
+               drm_fdinfo_print_size(p, prefix, "active", region, stats->active);
 
        if (supported_status & DRM_GEM_OBJECT_RESIDENT)
-               print_size(p, "resident", region, stats->resident);
+               drm_fdinfo_print_size(p, prefix, "resident", region,
+                                     stats->resident);
 
        if (supported_status & DRM_GEM_OBJECT_PURGEABLE)
-               print_size(p, "purgeable", region, stats->purgeable);
+               drm_fdinfo_print_size(p, prefix, "purgeable", region,
+                                     stats->purgeable);
 }
 EXPORT_SYMBOL(drm_print_memory_stats);
 

diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
index ef817926cddd36f0679ca2ee5af76bbf679c2941..94d365b225052144883f2fd176cf55a091a452e2 100644 (file)
--- a/include/drm/drm_file.h
+++ b/include/drm/drm_file.h
@@ -495,6 +495,11 @@ struct drm_memory_stats {
 enum drm_gem_object_status;
 
 int drm_memory_stats_is_zero(const struct drm_memory_stats *stats);
+void drm_fdinfo_print_size(struct drm_printer *p,
+                          const char *prefix,
+                          const char *stat,
+                          const char *region,
+                          u64 sz);
 void drm_print_memory_stats(struct drm_printer *p,
                            const struct drm_memory_stats *stats,
                            enum drm_gem_object_status supported_status,