Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 4 Apr 2023 21:29:44 +0200
From:   Daniel Vetter <daniel@ffwll.ch>
To:     yq882255@163.com
Cc:     dri-devel@lists.freedesktop.org,
        Erico Nunes <nunes.erico@gmail.com>,
        Lucas Stach <l.stach@pengutronix.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Ville =?iso-8859-1?Q?Syrj=E4l=E4?= 
        <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: Re: [PATCH 1/3] Revert "drm/lima: add show_fdinfo for drm usage
 stats"
Message-ID: <ZCx6qMqA9znAHGyS@phenom.ffwll.local>
Mail-Followup-To: yq882255@163.com, dri-devel@lists.freedesktop.org,
        Erico Nunes <nunes.erico@gmail.com>,
        Lucas Stach <l.stach@pengutronix.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>,
        David Airlie <airlied@gmail.com>, lima@lists.freedesktop.org,
        linux-kernel@vger.kernel.org, Qiang Yu <yuq825@gmail.com>
References: <20230404002601.24136-1-yq882255@163.com>
 <20230404002601.24136-2-yq882255@163.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230404002601.24136-2-yq882255@163.com>
Precedence: bulk

On Tue, Apr 04, 2023 at 08:25:59AM +0800, yq882255@163.com wrote:
> 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>

A bit an aside, but it feels like a lot more of the fdinfo scheduler code
should be common, and not just the minimal timekeeping? Just a thought for
the next round.
-Daniel

> ---
>  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
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch