drm/msm: Add a name field for gem objects

For debugging purposes it is useful to assign descriptions
to buffers so that we know what they are used for. Add
a field to the buffer object and use that to name the various
kernel side allocations which ends up looking like like this
in /d/dri/X/gem:

   flags       id ref  offset   kaddr            size     madv      name
   00040000: I  0 ( 1) 00000000 0000000070b79eca 00004096           memptrs
      vmas: [gpu: 01000000,mapped,inuse=1]
   00020000: I  0 ( 1) 00000000 0000000031ed4074 00032768           ring0

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

12 files changed, 50 insertions, 6 deletions

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index c514590ef593..d5f5e56422f5 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -510,6 +510,7 @@ static int a5xx_ucode_init(struct msm_gpu *gpu)
                 a5xx_gpu->pm4_bo = adreno_fw_create_bo(gpu,
                         adreno_gpu->fw[ADRENO_FW_PM4], &a5xx_gpu->pm4_iova);
 
+
                 if (IS_ERR(a5xx_gpu->pm4_bo)) {
                         ret = PTR_ERR(a5xx_gpu->pm4_bo);
                         a5xx_gpu->pm4_bo = NULL;
@@ -517,6 +518,8 @@ static int a5xx_ucode_init(struct msm_gpu *gpu)
                                 ret);
                         return ret;
                 }
+
+                msm_gem_object_set_name(a5xx_gpu->pm4_bo, "pm4fw");
         }
 
         if (!a5xx_gpu->pfp_bo) {
@@ -530,6 +533,8 @@ static int a5xx_ucode_init(struct msm_gpu *gpu)
                                 ret);
                         return ret;
                 }
+
+                msm_gem_object_set_name(a5xx_gpu->pfp_bo, "pfpfw");
         }
 
         gpu_write64(gpu, REG_A5XX_CP_ME_INSTR_BASE_LO,
@@ -1214,6 +1219,9 @@ static int a5xx_crashdumper_init(struct msm_gpu *gpu,
                 SZ_1M, MSM_BO_UNCACHED, gpu->aspace,
                 &dumper->bo, &dumper->iova);
 
+        if (!IS_ERR(dumper->ptr))
+                msm_gem_object_set_name(dumper->bo, "crashdump");
+
         return PTR_ERR_OR_ZERO(dumper->ptr);
 }
 
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c
index 66bcd88dd8c0..70e65c94e525 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_power.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c
@@ -300,6 +300,8 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)
         if (IS_ERR(ptr))
                 return;
 
+        msm_gem_object_set_name(a5xx_gpu->gpmu_bo, "gpmufw");
+
         while (cmds_size > 0) {
                 int i;
                 uint32_t _size = cmds_size > TYPE4_MAX_PAYLOAD ?
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
index 48481e663685..3d62310a535f 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
@@ -245,6 +245,8 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu,
         if (IS_ERR(ptr))
                 return PTR_ERR(ptr);
 
+        msm_gem_object_set_name(bo, "preempt");
+
         a5xx_gpu->preempt_bo[ring->id] = bo;
         a5xx_gpu->preempt_iova[ring->id] = iova;
         a5xx_gpu->preempt[ring->id] = ptr;
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 34d6087e5209..fefe773c989e 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -333,6 +333,8 @@ static int a6xx_ucode_init(struct msm_gpu *gpu)
 
                         return ret;
                 }
+
+                msm_gem_object_set_name(a6xx_gpu->sqe_bo, "sqefw");
         }
 
         gpu_write64(gpu, REG_A6XX_CP_SQE_INSTR_BASE_LO,
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index 3b7092e1dcc7..38e481d2d606 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -1083,6 +1083,8 @@ int dsi_tx_buf_alloc_6g(struct msm_dsi_host *msm_host, int size)
                 return PTR_ERR(data);
         }
 
+        msm_gem_object_set_name(msm_host->tx_gem_obj, "tx_gem");
+
         msm_host->tx_size = msm_host->tx_gem_obj->size;
 
         return 0;
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 3f8ed21dfffb..a73187274b62 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -810,7 +810,7 @@ static int msm_ioctl_gem_new(struct drm_device *dev, void *data,
         }
 
         return msm_gem_new_handle(dev, file, args->size,
-                        args->flags, &args->handle);
+                        args->flags, &args->handle, NULL);
 }
 
 static inline ktime_t to_ktime(struct drm_msm_timespec timeout)
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 955c2f522db6..71a03ce21da5 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -309,7 +309,7 @@ int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout);
 int msm_gem_cpu_fini(struct drm_gem_object *obj);
 void msm_gem_free_object(struct drm_gem_object *obj);
 int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
-                uint32_t size, uint32_t flags, uint32_t *handle);
+                uint32_t size, uint32_t flags, uint32_t *handle, char *name);
 struct drm_gem_object *msm_gem_new(struct drm_device *dev,
                 uint32_t size, uint32_t flags);
 struct drm_gem_object *msm_gem_new_locked(struct drm_device *dev,
@@ -325,6 +325,8 @@ void msm_gem_kernel_put(struct drm_gem_object *bo,
 struct drm_gem_object *msm_gem_import(struct drm_device *dev,
                 struct dma_buf *dmabuf, struct sg_table *sgt);
 
+void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...);
+
 int msm_framebuffer_prepare(struct drm_framebuffer *fb,
                 struct msm_gem_address_space *aspace);
 void msm_framebuffer_cleanup(struct drm_framebuffer *fb,
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 1224739094f2..67dfd8d3dc12 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -237,6 +237,8 @@ msm_alloc_stolen_fb(struct drm_device *dev, int w, int h, int p, uint32_t format
                 return ERR_CAST(bo);
         }
 
+        msm_gem_object_set_name(bo, "stolenfb");
+
         fb = msm_framebuffer_init(dev, &mode_cmd, &bo);
         if (IS_ERR(fb)) {
                 DRM_DEV_ERROR(dev->dev, "failed to allocate fb\n");
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 3d46d931ba67..ee44b0f01e90 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -491,7 +491,7 @@ int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
         args->pitch = align_pitch(args->width, args->bpp);
         args->size  = PAGE_ALIGN(args->pitch * args->height);
         return msm_gem_new_handle(dev, file, args->size,
-                        MSM_BO_SCANOUT | MSM_BO_WC, &args->handle);
+                        MSM_BO_SCANOUT | MSM_BO_WC, &args->handle, "dumb");
 }
 
 int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
@@ -794,7 +794,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
                         obj->name, kref_read(&obj->refcount),
                         off, msm_obj->vaddr);
 
-        seq_printf(m, " %08zu%9s\n", obj->size, madv);
+        seq_printf(m, " %08zu %9s %-32s\n", obj->size, madv, msm_obj->name);
 
         if (!list_empty(&msm_obj->vmas)) {
 
@@ -833,7 +833,7 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
         int count = 0;
         size_t size = 0;
 
-        seq_puts(m, "   flags       id ref  offset   kaddr            size     madv\n");
+        seq_puts(m, "   flags       id ref  offset   kaddr            size     madv      name\n");
         list_for_each_entry(msm_obj, list, mm_list) {
                 struct drm_gem_object *obj = &msm_obj->base;
                 seq_puts(m, "   ");
@@ -890,7 +890,8 @@ void msm_gem_free_object(struct drm_gem_object *obj)
 
 /* convenience method to construct a GEM buffer object, and userspace handle */
 int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
-                uint32_t size, uint32_t flags, uint32_t *handle)
+                uint32_t size, uint32_t flags, uint32_t *handle,
+                char *name)
 {
         struct drm_gem_object *obj;
         int ret;
@@ -900,6 +901,9 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
         if (IS_ERR(obj))
                 return PTR_ERR(obj);
 
+        if (name)
+                msm_gem_object_set_name(obj, "%s", name);
+
         ret = drm_gem_handle_create(file, obj, handle);
 
         /* drop reference from allocate - handle holds it now */
@@ -1153,3 +1157,16 @@ void msm_gem_kernel_put(struct drm_gem_object *bo,
         else
                 drm_gem_object_put_unlocked(bo);
 }
+
+void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...)
+{
+        struct msm_gem_object *msm_obj = to_msm_bo(bo);
+        va_list ap;
+
+        if (!fmt)
+                return;
+
+        va_start(ap, fmt);
+        vsnprintf(msm_obj->name, sizeof(msm_obj->name), fmt, ap);
+        va_end(ap);
+}
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index b318fe278e52..2064fac871b8 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -93,6 +93,8 @@ struct msm_gem_object {
          */
         struct drm_mm_node *vram_node;
         struct mutex lock; /* Protects resources associated with bo */
+
+        char name[32]; /* Identifier to print for the debugfs files */
 };
 #define to_msm_bo(x) container_of(x, struct msm_gem_object, base)
 
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 86bb1ed8ddbb..c3909ba75b12 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -950,6 +950,8 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                 goto fail;
         }
 
+        msm_gem_object_set_name(gpu->memptrs_bo, "memptrs");
+
         if (nr_rings > ARRAY_SIZE(gpu->rb)) {
                 DRM_DEV_INFO_ONCE(drm->dev, "Only creating %zu ringbuffers\n",
                         ARRAY_SIZE(gpu->rb));
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
index 9fa9525c5293..6169bd6ca153 100644
--- a/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -45,6 +45,9 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id,
                 ring->start = 0;
                 goto fail;
         }
+
+        msm_gem_object_set_name(ring->bo, "ring%d", id);
+
         ring->end   = ring->start + (MSM_GPU_RINGBUFFER_SZ >> 2);
         ring->next  = ring->start;
         ring->cur   = ring->start;