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 00:16:39 +0300
From:   Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
To:     Erico Nunes <nunes.erico@gmail.com>
Cc:     Qiang Yu <yuq825@gmail.com>, dri-devel@lists.freedesktop.org,
        David Airlie <airlied@linux.ie>, lima@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] drm/lima: add usage counting method to ctx_mgr
Message-ID: <ZCtCNx5JUKFcoCCp@intel.com>
References: <20230312233052.21095-1-nunes.erico@gmail.com>
 <20230312233052.21095-2-nunes.erico@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20230312233052.21095-2-nunes.erico@gmail.com>
Precedence: bulk

On Mon, Mar 13, 2023 at 12:30:50AM +0100, Erico Nunes wrote:
> lima maintains a context manager per drm_file, similar to amdgpu.
> In order to account for the complete usage per drm_file, all of the
> associated contexts need to be considered.
> Previously released contexts also need to be accounted for but their
> drm_sched_entity info is gone once they get released, so account for it
> in the ctx_mgr.
> 
> Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
> ---
>  drivers/gpu/drm/lima/lima_ctx.c | 30 +++++++++++++++++++++++++++++-
>  drivers/gpu/drm/lima/lima_ctx.h |  3 +++
>  2 files changed, 32 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> index 891d5cd5019a..e008e586fad0 100644
> --- a/drivers/gpu/drm/lima/lima_ctx.c
> +++ b/drivers/gpu/drm/lima/lima_ctx.c
> @@ -15,6 +15,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
>  	if (!ctx)
>  		return -ENOMEM;
>  	ctx->dev = dev;
> +	ctx->mgr = mgr;
>  	kref_init(&ctx->refcnt);
>  
>  	for (i = 0; i < lima_pipe_num; i++) {
> @@ -42,10 +43,17 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
>  static void lima_ctx_do_release(struct kref *ref)
>  {
>  	struct lima_ctx *ctx = container_of(ref, struct lima_ctx, refcnt);
> +	struct lima_ctx_mgr *mgr = ctx->mgr;
>  	int i;
>  
> -	for (i = 0; i < lima_pipe_num; i++)
> +	for (i = 0; i < lima_pipe_num; i++) {
> +		struct lima_sched_context *context = &ctx->context[i];
> +		struct drm_sched_entity *entity = &context->base;
> +
> +		mgr->elapsed_ns[i] += entity->elapsed_ns;

drm-tip build is now broken because of this vs. 
commit baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")

../drivers/gpu/drm/lima/lima_ctx.c: In function ‘lima_ctx_do_release’:
../drivers/gpu/drm/lima/lima_ctx.c:53:45: error: ‘struct
drm_sched_entity’ has no member named ‘elapsed_ns’
   53 |                 mgr->elapsed_ns[i] += entity->elapsed_ns;

-- 
Ville Syrjälä
Intel