drm/msm: Switch to fdinfo helper

Now that we have a common helper, use it.

v2: Rebase on drm-misc-next

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230524155956.382440-4-robdclark@gmail.com

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 060c7689a739b7b5b28fe6cc8ae300e1664bccc7..02fd6093f9b0b25a16704b9df010ca8b5a8ae6cf 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1057,23 +1057,21 @@ static const struct drm_ioctl_desc msm_ioctls[] = {
        DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW),
 };
 
-static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f)
+static void msm_show_fdinfo(struct drm_printer *p, struct drm_file *file)
 {
-       struct drm_file *file = f->private_data;
        struct drm_device *dev = file->minor->dev;
        struct msm_drm_private *priv = dev->dev_private;
-       struct drm_printer p = drm_seq_file_printer(m);
 
        if (!priv->gpu)
                return;
 
-       msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, &p);
+       msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, p);
 }
 
 static const struct file_operations fops = {
        .owner = THIS_MODULE,
        DRM_GEM_FOPS,
-       .show_fdinfo = msm_fop_show_fdinfo,
+       .show_fdinfo = drm_show_fdinfo,
 };
 
 static const struct drm_driver msm_driver = {
@@ -1083,7 +1081,7 @@ static const struct drm_driver msm_driver = {
                                DRIVER_MODESET |
                                DRIVER_SYNCOBJ,
        .open               = msm_open,
-       .postclose           = msm_postclose,
+       .postclose          = msm_postclose,
        .dumb_create        = msm_gem_dumb_create,
        .dumb_map_offset    = msm_gem_dumb_map_offset,
        .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
@@ -1093,6 +1091,7 @@ static const struct drm_driver msm_driver = {
 #ifdef CONFIG_DEBUG_FS
        .debugfs_init       = msm_debugfs_init,
 #endif
+       .show_fdinfo        = msm_show_fdinfo,
        .ioctls             = msm_ioctls,
        .num_ioctls         = ARRAY_SIZE(msm_ioctls),
        .fops               = &fops,

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 26ebda40be4f0c93574a9a21fef9be1c25d0a425..c403912d13ab795b85c82c85bf2c31d31b8860f4 100644 (file)
--- 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);