Commit 51d86ee5 authored by Rob Clark's avatar Rob Clark Committed by Neil Armstrong
Browse files

drm/msm: Switch to fdinfo helper 



Now that we have a common helper, use it.

v2: Rebase on drm-misc-next

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230524155956.382440-4-robdclark@gmail.com
parent 3f09a0cd

drivers/gpu/drm/msm/msm_drv.c

+5 −6
Original line number Diff line number Diff line
@@ -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 = {
@@ -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,

drivers/gpu/drm/msm/msm_gpu.c

+0 −2
Original line number Diff line number Diff line
@@ -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);