| Message ID | 20230406215917.1475704-3-robdclark@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm: fdinfo memory stats | expand |
On Thu, 6 Apr 2023 at 22:59, Rob Clark <robdclark@gmail.com> wrote: > > From: Rob Clark <robdclark@chromium.org> > > Use the new helper to export stats about memory usage. > > Signed-off-by: Rob Clark <robdclark@chromium.org> > --- > drivers/gpu/drm/msm/msm_drv.c | 26 +++++++++++++++++++++++++- > drivers/gpu/drm/msm/msm_gpu.c | 2 -- > 2 files changed, 25 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 9b6f17b1261f..385776f6a531 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -1043,17 +1043,40 @@ static const struct drm_ioctl_desc msm_ioctls[] = { > DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), > }; > > +enum drm_gem_object_status gem_status(struct drm_gem_object *obj) > +{ > + struct msm_gem_object *msm_obj = to_msm_bo(obj); > + enum drm_gem_object_status status = 0; > + > + if (!dma_resv_test_signaled(obj->resv, dma_resv_usage_rw(true))) > + status |= DRM_GEM_OBJECT_ACTIVE; > + > + if (msm_obj->pages) > + status |= DRM_GEM_OBJECT_RESIDENT; > + > + if (msm_obj->madv == MSM_MADV_DONTNEED) > + status |= DRM_GEM_OBJECT_PURGEABLE; > + > + return status; > +} > + > static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f) > { > struct drm_file *file = f->private_data; > struct drm_device *dev = file->minor->dev; > struct msm_drm_private *priv = dev->dev_private; > + struct msm_file_private *ctx = file->driver_priv; > struct drm_printer p = drm_seq_file_printer(m); > > if (!priv->gpu) > return; > > - msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, &p); > + drm_printf(&p, "drm-driver:\t%s\n", dev->driver->name); > + drm_printf(&p, "drm-client-id:\t%u\n", ctx->seqno); > + > + msm_gpu_show_fdinfo(priv->gpu, ctx, &p); > + > + drm_print_memory_stats(file, &p, gem_status); > } > > static const struct file_operations fops = { > @@ -1067,6 +1090,7 @@ static const struct drm_driver msm_driver = { > DRIVER_RENDER | > DRIVER_ATOMIC | > DRIVER_MODESET | > + DRIVER_SYNCOBJ_TIMELINE | This line should probably be its own patch. AFAICT it was supported since ab723b7a992a19b843f798b183f53f7472f598c8, although explicitly kept disabled until there's userspace/turnip support. With the above line removed, the patch is: Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> HTH Emil
On Sat, Apr 8, 2023 at 5:28 AM Emil Velikov <emil.l.velikov@gmail.com> wrote: > > On Thu, 6 Apr 2023 at 22:59, Rob Clark <robdclark@gmail.com> wrote: > > > > From: Rob Clark <robdclark@chromium.org> > > > > Use the new helper to export stats about memory usage. > > > > Signed-off-by: Rob Clark <robdclark@chromium.org> > > --- > > drivers/gpu/drm/msm/msm_drv.c | 26 +++++++++++++++++++++++++- > > drivers/gpu/drm/msm/msm_gpu.c | 2 -- > > 2 files changed, 25 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > > index 9b6f17b1261f..385776f6a531 100644 > > --- a/drivers/gpu/drm/msm/msm_drv.c > > +++ b/drivers/gpu/drm/msm/msm_drv.c > > @@ -1043,17 +1043,40 @@ static const struct drm_ioctl_desc msm_ioctls[] = { > > DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), > > }; > > > > +enum drm_gem_object_status gem_status(struct drm_gem_object *obj) > > +{ > > + struct msm_gem_object *msm_obj = to_msm_bo(obj); > > + enum drm_gem_object_status status = 0; > > + > > + if (!dma_resv_test_signaled(obj->resv, dma_resv_usage_rw(true))) > > + status |= DRM_GEM_OBJECT_ACTIVE; > > + > > + if (msm_obj->pages) > > + status |= DRM_GEM_OBJECT_RESIDENT; > > + > > + if (msm_obj->madv == MSM_MADV_DONTNEED) > > + status |= DRM_GEM_OBJECT_PURGEABLE; > > + > > + return status; > > +} > > + > > static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f) > > { > > struct drm_file *file = f->private_data; > > struct drm_device *dev = file->minor->dev; > > struct msm_drm_private *priv = dev->dev_private; > > + struct msm_file_private *ctx = file->driver_priv; > > struct drm_printer p = drm_seq_file_printer(m); > > > > if (!priv->gpu) > > return; > > > > - msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, &p); > > + drm_printf(&p, "drm-driver:\t%s\n", dev->driver->name); > > + drm_printf(&p, "drm-client-id:\t%u\n", ctx->seqno); > > + > > + msm_gpu_show_fdinfo(priv->gpu, ctx, &p); > > + > > + drm_print_memory_stats(file, &p, gem_status); > > } > > > > static const struct file_operations fops = { > > @@ -1067,6 +1090,7 @@ static const struct drm_driver msm_driver = { > > DRIVER_RENDER | > > DRIVER_ATOMIC | > > DRIVER_MODESET | > > + DRIVER_SYNCOBJ_TIMELINE | > > This line should probably be its own patch. AFAICT it was supported > since ab723b7a992a19b843f798b183f53f7472f598c8, although explicitly > kept disabled until there's userspace/turnip support. ahh, yes, that wasn't intended to be part of this patch, just a local thing I happened to be testing BR, -R > With the above line removed, the patch is: > Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> > > HTH > Emil
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 9b6f17b1261f..385776f6a531 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1043,17 +1043,40 @@ static const struct drm_ioctl_desc msm_ioctls[] = { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), }; +enum drm_gem_object_status gem_status(struct drm_gem_object *obj) +{ + struct msm_gem_object *msm_obj = to_msm_bo(obj); + enum drm_gem_object_status status = 0; + + if (!dma_resv_test_signaled(obj->resv, dma_resv_usage_rw(true))) + status |= DRM_GEM_OBJECT_ACTIVE; + + if (msm_obj->pages) + status |= DRM_GEM_OBJECT_RESIDENT; + + if (msm_obj->madv == MSM_MADV_DONTNEED) + status |= DRM_GEM_OBJECT_PURGEABLE; + + return status; +} + static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f) { struct drm_file *file = f->private_data; struct drm_device *dev = file->minor->dev; struct msm_drm_private *priv = dev->dev_private; + struct msm_file_private *ctx = file->driver_priv; struct drm_printer p = drm_seq_file_printer(m); if (!priv->gpu) return; - msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, &p); + drm_printf(&p, "drm-driver:\t%s\n", dev->driver->name); + drm_printf(&p, "drm-client-id:\t%u\n", ctx->seqno); + + msm_gpu_show_fdinfo(priv->gpu, ctx, &p); + + drm_print_memory_stats(file, &p, gem_status); } static const struct file_operations fops = { @@ -1067,6 +1090,7 @@ static const struct drm_driver msm_driver = { DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_MODESET | + DRIVER_SYNCOBJ_TIMELINE | DRIVER_SYNCOBJ, .open = msm_open, .postclose = msm_postclose, diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 26ebda40be4f..c403912d13ab 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -151,8 +151,6 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu) void msm_gpu_show_fdinfo(struct msm_gpu *gpu, struct msm_file_private *ctx, struct drm_printer *p) { - drm_printf(p, "drm-driver:\t%s\n", gpu->dev->driver->name); - drm_printf(p, "drm-client-id:\t%u\n", ctx->seqno); drm_printf(p, "drm-engine-gpu:\t%llu ns\n", ctx->elapsed_ns); drm_printf(p, "drm-cycles-gpu:\t%llu\n", ctx->cycles); drm_printf(p, "drm-maxfreq-gpu:\t%u Hz\n", gpu->fast_rate);