lkml.org 
[lkml]   [2023]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 2/7] drm/msm: Switch to fdinfo helper
    Date
    From: Rob Clark <robdclark@chromium.org>

    Signed-off-by: Rob Clark <robdclark@chromium.org>
    ---
    drivers/gpu/drm/msm/msm_drv.c | 11 +++++------
    drivers/gpu/drm/msm/msm_gpu.c | 2 --
    2 files changed, 5 insertions(+), 8 deletions(-)

    diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
    index 5a10d28de9dd..e516a3544505 100644
    --- a/drivers/gpu/drm/msm/msm_drv.c
    +++ b/drivers/gpu/drm/msm/msm_drv.c
    @@ -1043,23 +1043,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_fop_show_fdinfo,
    };

    static const struct drm_driver msm_driver = {
    @@ -1070,7 +1068,7 @@ static const struct drm_driver msm_driver = {
    DRIVER_SYNCOBJ_TIMELINE |
    DRIVER_SYNCOBJ,
    .open = msm_open,
    - .postclose = msm_postclose,
    + .postclose = msm_postclose,
    .lastclose = drm_fb_helper_lastclose,
    .dumb_create = msm_gem_dumb_create,
    .dumb_map_offset = msm_gem_dumb_map_offset,
    @@ -1081,6 +1079,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 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);
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-04-12 00:59    [W:4.259 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site