mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: yq882255@163.com
To: dri-devel@lists.freedesktop.org
Cc: "Erico Nunes" <nunes.erico@gmail.com>,
	"Lucas Stach" <l.stach@pengutronix.de>,
	"Stephen Rothwell" <sfr@canb.auug.org.au>,
	"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	"David Airlie" <airlied@gmail.com>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	lima@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	"Qiang Yu" <yuq825@gmail.com>
Subject: [PATCH 1/3] Revert "drm/lima: add show_fdinfo for drm usage stats"
Date: Tue,  4 Apr 2023 08:25:59 +0800	[thread overview]
Message-ID: <20230404002601.24136-2-yq882255@163.com> (raw)
In-Reply-To: <20230404002601.24136-1-yq882255@163.com>

From: Qiang Yu <yuq825@gmail.com>

This reverts commit 4a66f3da99dcb4dcbd28544110636b50adfb0f0d.

This is due to the depend commit has been reverted on upstream:
baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")

Signed-off-by: Qiang Yu <yuq825@gmail.com>
---
 drivers/gpu/drm/lima/lima_drv.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c
index 3420875d6fc6..f456a471216b 100644
--- a/drivers/gpu/drm/lima/lima_drv.c
+++ b/drivers/gpu/drm/lima/lima_drv.c
@@ -261,36 +261,7 @@ static const struct drm_ioctl_desc lima_drm_driver_ioctls[] = {
 	DRM_IOCTL_DEF_DRV(LIMA_CTX_FREE, lima_ioctl_ctx_free, DRM_RENDER_ALLOW),
 };
 
-static void lima_drm_driver_show_fdinfo(struct seq_file *m, struct file *filp)
-{
-	struct drm_file *file = filp->private_data;
-	struct drm_device *dev = file->minor->dev;
-	struct lima_device *ldev = to_lima_dev(dev);
-	struct lima_drm_priv *priv = file->driver_priv;
-	struct lima_ctx_mgr *ctx_mgr = &priv->ctx_mgr;
-	u64 usage[lima_pipe_num];
-
-	lima_ctx_mgr_usage(ctx_mgr, usage);
-
-	/*
-	 * For a description of the text output format used here, see
-	 * Documentation/gpu/drm-usage-stats.rst.
-	 */
-	seq_printf(m, "drm-driver:\t%s\n", dev->driver->name);
-	seq_printf(m, "drm-client-id:\t%u\n", priv->id);
-	for (int i = 0; i < lima_pipe_num; i++) {
-		struct lima_sched_pipe *pipe = &ldev->pipe[i];
-		struct drm_gpu_scheduler *sched = &pipe->base;
-
-		seq_printf(m, "drm-engine-%s:\t%llu ns\n", sched->name, usage[i]);
-	}
-}
-
-static const struct file_operations lima_drm_driver_fops = {
-	.owner = THIS_MODULE,
-	DRM_GEM_FOPS,
-	.show_fdinfo = lima_drm_driver_show_fdinfo,
-};
+DEFINE_DRM_GEM_FOPS(lima_drm_driver_fops);
 
 /*
  * Changelog:
-- 
2.25.1


  reply	other threads:[~2023-04-04  0:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-04  0:25 [PATCH 0/3] Revert lima fdinfo patchset yq882255
2023-04-04  0:25 ` yq882255 [this message]
2023-04-04 19:29   ` [PATCH 1/3] Revert "drm/lima: add show_fdinfo for drm usage stats" Daniel Vetter
2023-04-04  0:26 ` [PATCH 2/3] Revert "drm/lima: allocate unique id per drm_file" yq882255
2023-04-04  0:26 ` [PATCH 3/3] Revert "drm/lima: add usage counting method to ctx_mgr" yq882255
2023-04-04 15:17 ` [PATCH 0/3] Revert lima fdinfo patchset Emil Velikov
2023-04-04 19:28   ` Daniel Vetter
2023-04-05  0:50     ` Qiang Yu
2023-04-05  8:43       ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230404002601.24136-2-yq882255@163.com \
    --to=yq882255@163.com \
    --cc=airlied@gmail.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=l.stach@pengutronix.de \
    --cc=lima@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nunes.erico@gmail.com \
    --cc=sfr@canb.auug.org.au \
    --cc=ville.syrjala@linux.intel.com \
    --cc=yuq825@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®