From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A42AC43334 for ; Wed, 15 Jun 2022 12:44:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348958AbiFOMoe (ORCPT ); Wed, 15 Jun 2022 08:44:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348894AbiFOMoV (ORCPT ); Wed, 15 Jun 2022 08:44:21 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 390C240A10 for ; Wed, 15 Jun 2022 05:44:20 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id l20so6358224lji.0 for ; Wed, 15 Jun 2022 05:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=u1z8ewH9twrYjIuKxjz6km+1YgvAUwQA4rxgSTCF6ns=; b=PkHxUVrTWFqZd50er9QT/K67+UOAQZslg9eN16KjDHX/QpeYSZSNyFA2YT+Hl7r/yR /dhUpPRUUYrznisBw0F44p7I1FxDE+4d7Vh7tny4RzPU0JyRPBv76c5qkzGfNr+4StMs rtbjJFL9+3/BSEP3gtBW4vcr4HRWHqlDLC2dpjsxjGva06wo5GcMkZ/05hH6fSK1pDzc YOSbWBSOYTDNhdFHxPFYYuhJ6xBxzHX2jBj+ly4EUWrxu6iWOhkNsGLJbaVQuQqVWXLk 44la15iM3anCDS6KbmL+ZCAjTPyncckaN7Gqg6k3rJ/C30cqAhY1Ba8uhT0UDhUYfbMv o9pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=u1z8ewH9twrYjIuKxjz6km+1YgvAUwQA4rxgSTCF6ns=; b=HSOTbYTQZABSQaZm/Qy2ufZPhl8KxnCMfxWJ9XKJt6Zkl5JPlNIFso85O2ippL9Kwr FPkpRRU7pJvCU6k85TOgU4JDxnDEuHF+lTCV/fiLP0sNGVxYeLWFsMziaPpPqbGD6KIu o6RbNPA8cAHHUvwfllGnnY2zsv24rcGp3Gz+V/nzgGUXgS0xDpbZlTPtGuwq8ry5SrEm rgoSldp1e7LlKqQPLyfghUlrp9f5HPUPf9kPwYquQoS3tTOFeb+WwkHDyGlPteQSEAoc DZfUIftzs/pnx3cIZiEuyJnToGuoTpl3SoDELpfcCTc7qRZeYG1dejgJITLCG+GOe/Wr mGxw== X-Gm-Message-State: AJIora8HcIQYXhBFSf6KBImXx8B0j1tTqyW8D3hO5t+Q4k2wqwID3zLe eHKrDXaCj5iZp3iVAVs1liyixqLhiT0cWcPY X-Google-Smtp-Source: AGRyM1u08Oq2tHefeTz5JnQOzos0N8jotQr1JQouoLzFOrPMZzUFTE6v1Y9Vbn2sFKX2kcSnVednYA== X-Received: by 2002:a2e:87c8:0:b0:255:6d59:ebce with SMTP id v8-20020a2e87c8000000b002556d59ebcemr4918316ljj.455.1655297058156; Wed, 15 Jun 2022 05:44:18 -0700 (PDT) Received: from [192.168.1.211] ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id j11-20020a05651231cb00b004790506cf98sm1781254lfe.303.2022.06.15.05.44.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Jun 2022 05:44:17 -0700 (PDT) Message-ID: Date: Wed, 15 Jun 2022 15:44:16 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v3 2/2] drm/msm: Expose client engine utilization via fdinfo Content-Language: en-GB To: Rob Clark , dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Tvrtko Ursulin , Thomas Zimmermann , Chris Healy , Rob Clark , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Jonathan Corbet , Abhinav Kumar , Sean Paul , "open list:DOCUMENTATION" , open list References: <20220609174213.2265938-1-robdclark@gmail.com> <20220609174213.2265938-2-robdclark@gmail.com> From: Dmitry Baryshkov In-Reply-To: <20220609174213.2265938-2-robdclark@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 09/06/2022 20:42, Rob Clark wrote: > From: Rob Clark > > Similar to AMD commit > 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the > infrastructure added in previous patches, we add basic client info > and GPU engine utilisation for msm. > > Example output: > > # cat /proc/`pgrep glmark2`/fdinfo/6 > pos: 0 > flags: 02400002 > mnt_id: 21 > ino: 162 > drm-driver: msm > drm-client-id: 7 > drm-engine-gpu: 1734371319 ns > drm-cycles-gpu: 1153645024 > drm-maxfreq-gpu: 800000000 Hz > > See also: https://patchwork.freedesktop.org/patch/468505/ > > v2: Add dev-maxfreq-$engine and update drm-usage-stats.rst > v3: spelling and compiler warning > > Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov > --- > Documentation/gpu/drm-usage-stats.rst | 21 +++++++++++++++++++++ > drivers/gpu/drm/msm/msm_drv.c | 19 ++++++++++++++++++- > drivers/gpu/drm/msm/msm_gpu.c | 21 +++++++++++++++++++-- > drivers/gpu/drm/msm/msm_gpu.h | 19 +++++++++++++++++++ > 4 files changed, 77 insertions(+), 3 deletions(-) > > diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst > index 6c9f166a8d6f..92c5117368d7 100644 > --- a/Documentation/gpu/drm-usage-stats.rst > +++ b/Documentation/gpu/drm-usage-stats.rst > @@ -105,6 +105,27 @@ object belong to this client, in the respective memory region. > Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB' > indicating kibi- or mebi-bytes. > > +- drm-cycles- > + > +Engine identifier string must be the same as the one specified in the > +drm-engine- tag and shall contain the number of busy cycles for the given > +engine. > + > +Values are not required to be constantly monotonic if it makes the driver > +implementation easier, but are required to catch up with the previously reported > +larger value within a reasonable period. Upon observing a value lower than what > +was previously read, userspace is expected to stay with that larger previous > +value until a monotonic update is seen. > + > +- drm-maxfreq- [Hz|MHz|KHz] > + > +Engine identifier string must be the same as the one specified in the > +drm-engine- tag and shall contain the maximum frequency for the given > +engine. Taken together with drm-cycles-, this can be used to calculate > +percentage utilization of the engine, whereas drm-engine- only reflects > +time active without considering what frequency the engine is operating as a > +percentage of it's maximum frequency. > + > =============================== > Driver specific implementations > =============================== > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 14ab9a627d8b..57a66093e671 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -948,7 +948,24 @@ static const struct drm_ioctl_desc msm_ioctls[] = { > DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), > }; > > -DEFINE_DRM_GEM_FOPS(fops); > +static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f) > +{ > + 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); > +} > + > +static const struct file_operations fops = { > + .owner = THIS_MODULE, > + DRM_GEM_FOPS, > + .show_fdinfo = msm_fop_show_fdinfo, > +}; > > static const struct drm_driver msm_driver = { > .driver_features = DRIVER_GEM | > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index 244511f85044..f99292eaf529 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -4,6 +4,8 @@ > * Author: Rob Clark > */ > > +#include "drm/drm_drv.h" > + > #include "msm_gpu.h" > #include "msm_gem.h" > #include "msm_mmu.h" > @@ -146,6 +148,16 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu) > return 0; > } > > +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); > +} > + > int msm_gpu_hw_init(struct msm_gpu *gpu) > { > int ret; > @@ -652,7 +664,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, > { > int index = submit->seqno % MSM_GPU_SUBMIT_STATS_COUNT; > volatile struct msm_gpu_submit_stats *stats; > - u64 elapsed, clock = 0; > + u64 elapsed, clock = 0, cycles; > unsigned long flags; > > stats = &ring->memptrs->stats[index]; > @@ -660,12 +672,17 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, > elapsed = (stats->alwayson_end - stats->alwayson_start) * 10000; > do_div(elapsed, 192); > > + cycles = stats->cpcycles_end - stats->cpcycles_start; > + > /* Calculate the clock frequency from the number of CP cycles */ > if (elapsed) { > - clock = (stats->cpcycles_end - stats->cpcycles_start) * 1000; > + clock = cycles * 1000; > do_div(clock, elapsed); > } > > + submit->queue->ctx->elapsed_ns += elapsed; > + submit->queue->ctx->cycles += cycles; > + > trace_msm_gpu_submit_retired(submit, elapsed, clock, > stats->alwayson_start, stats->alwayson_end); > > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > index 6def00883046..4911943ba53b 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.h > +++ b/drivers/gpu/drm/msm/msm_gpu.h > @@ -361,6 +361,22 @@ struct msm_file_private { > /** cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE */ > char *cmdline; > > + /** > + * elapsed: > + * > + * The total (cumulative) elapsed time GPU was busy with rendering > + * from this context in ns. > + */ > + uint64_t elapsed_ns; > + > + /** > + * cycles: > + * > + * The total (cumulative) GPU cycles elapsed attributed to this > + * context. > + */ > + uint64_t cycles; > + > /** > * entities: > * > @@ -544,6 +560,9 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 lo, u32 hi, u64 val) > int msm_gpu_pm_suspend(struct msm_gpu *gpu); > int msm_gpu_pm_resume(struct msm_gpu *gpu); > > +void msm_gpu_show_fdinfo(struct msm_gpu *gpu, struct msm_file_private *ctx, > + struct drm_printer *p); > + > int msm_submitqueue_init(struct drm_device *drm, struct msm_file_private *ctx); > struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *ctx, > u32 id); -- With best wishes Dmitry From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C24FC433EF for ; Wed, 15 Jun 2022 12:44:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63CEC10E572; Wed, 15 Jun 2022 12:44:21 +0000 (UTC) Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id E374110E572 for ; Wed, 15 Jun 2022 12:44:19 +0000 (UTC) Received: by mail-lj1-x22a.google.com with SMTP id y29so13116758ljd.7 for ; Wed, 15 Jun 2022 05:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=u1z8ewH9twrYjIuKxjz6km+1YgvAUwQA4rxgSTCF6ns=; b=PkHxUVrTWFqZd50er9QT/K67+UOAQZslg9eN16KjDHX/QpeYSZSNyFA2YT+Hl7r/yR /dhUpPRUUYrznisBw0F44p7I1FxDE+4d7Vh7tny4RzPU0JyRPBv76c5qkzGfNr+4StMs rtbjJFL9+3/BSEP3gtBW4vcr4HRWHqlDLC2dpjsxjGva06wo5GcMkZ/05hH6fSK1pDzc YOSbWBSOYTDNhdFHxPFYYuhJ6xBxzHX2jBj+ly4EUWrxu6iWOhkNsGLJbaVQuQqVWXLk 44la15iM3anCDS6KbmL+ZCAjTPyncckaN7Gqg6k3rJ/C30cqAhY1Ba8uhT0UDhUYfbMv o9pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=u1z8ewH9twrYjIuKxjz6km+1YgvAUwQA4rxgSTCF6ns=; b=4nxTFBQxE0SaDXhjQFQauwgtCkDymhCcLjp2z4PEzX43BZkc+MBV9AttCyZBcUL8QB Zd4DNL4vYN2GSiS/Z3K62YHATfSVOfOjVn27M4ue1fayOB4h6ilRHzi9OERoSZOtTyU8 3e3QOUHCxGMjKPV+rHYagjzUtaDtm7jQ548EjS0O/T4dvSbFYwVtfVoN95EQgvcj52w8 0w6l5FiadCib/fhdcN9fksDoU96I9/8LC04QK1s98hXfd5J9BqSIW8wsqa3x6lpvFVuS uCyaOcgPlf8ZkJVznE+CKaWyh7cbJKPkXBRQnee8Ap3GRtVilJwTZ2oZCP3TpVYs2jg6 8qQQ== X-Gm-Message-State: AJIora/XKRbWFuTw7GXy7oXJwFYYS1rsSaSOUQlhUImSaGGFUUe52Aii ZmMRt5Vg0SafAHbPhxwB0buRnw== X-Google-Smtp-Source: AGRyM1u08Oq2tHefeTz5JnQOzos0N8jotQr1JQouoLzFOrPMZzUFTE6v1Y9Vbn2sFKX2kcSnVednYA== X-Received: by 2002:a2e:87c8:0:b0:255:6d59:ebce with SMTP id v8-20020a2e87c8000000b002556d59ebcemr4918316ljj.455.1655297058156; Wed, 15 Jun 2022 05:44:18 -0700 (PDT) Received: from [192.168.1.211] ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id j11-20020a05651231cb00b004790506cf98sm1781254lfe.303.2022.06.15.05.44.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Jun 2022 05:44:17 -0700 (PDT) Message-ID: Date: Wed, 15 Jun 2022 15:44:16 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v3 2/2] drm/msm: Expose client engine utilization via fdinfo Content-Language: en-GB To: Rob Clark , dri-devel@lists.freedesktop.org References: <20220609174213.2265938-1-robdclark@gmail.com> <20220609174213.2265938-2-robdclark@gmail.com> From: Dmitry Baryshkov In-Reply-To: <20220609174213.2265938-2-robdclark@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Tvrtko Ursulin , Jonathan Corbet , David Airlie , linux-arm-msm@vger.kernel.org, "open list:DOCUMENTATION" , Abhinav Kumar , open list , Sean Paul , Thomas Zimmermann , freedreno@lists.freedesktop.org, Chris Healy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 09/06/2022 20:42, Rob Clark wrote: > From: Rob Clark > > Similar to AMD commit > 874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the > infrastructure added in previous patches, we add basic client info > and GPU engine utilisation for msm. > > Example output: > > # cat /proc/`pgrep glmark2`/fdinfo/6 > pos: 0 > flags: 02400002 > mnt_id: 21 > ino: 162 > drm-driver: msm > drm-client-id: 7 > drm-engine-gpu: 1734371319 ns > drm-cycles-gpu: 1153645024 > drm-maxfreq-gpu: 800000000 Hz > > See also: https://patchwork.freedesktop.org/patch/468505/ > > v2: Add dev-maxfreq-$engine and update drm-usage-stats.rst > v3: spelling and compiler warning > > Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov > --- > Documentation/gpu/drm-usage-stats.rst | 21 +++++++++++++++++++++ > drivers/gpu/drm/msm/msm_drv.c | 19 ++++++++++++++++++- > drivers/gpu/drm/msm/msm_gpu.c | 21 +++++++++++++++++++-- > drivers/gpu/drm/msm/msm_gpu.h | 19 +++++++++++++++++++ > 4 files changed, 77 insertions(+), 3 deletions(-) > > diff --git a/Documentation/gpu/drm-usage-stats.rst b/Documentation/gpu/drm-usage-stats.rst > index 6c9f166a8d6f..92c5117368d7 100644 > --- a/Documentation/gpu/drm-usage-stats.rst > +++ b/Documentation/gpu/drm-usage-stats.rst > @@ -105,6 +105,27 @@ object belong to this client, in the respective memory region. > Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB' > indicating kibi- or mebi-bytes. > > +- drm-cycles- > + > +Engine identifier string must be the same as the one specified in the > +drm-engine- tag and shall contain the number of busy cycles for the given > +engine. > + > +Values are not required to be constantly monotonic if it makes the driver > +implementation easier, but are required to catch up with the previously reported > +larger value within a reasonable period. Upon observing a value lower than what > +was previously read, userspace is expected to stay with that larger previous > +value until a monotonic update is seen. > + > +- drm-maxfreq- [Hz|MHz|KHz] > + > +Engine identifier string must be the same as the one specified in the > +drm-engine- tag and shall contain the maximum frequency for the given > +engine. Taken together with drm-cycles-, this can be used to calculate > +percentage utilization of the engine, whereas drm-engine- only reflects > +time active without considering what frequency the engine is operating as a > +percentage of it's maximum frequency. > + > =============================== > Driver specific implementations > =============================== > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 14ab9a627d8b..57a66093e671 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -948,7 +948,24 @@ static const struct drm_ioctl_desc msm_ioctls[] = { > DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), > }; > > -DEFINE_DRM_GEM_FOPS(fops); > +static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f) > +{ > + 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); > +} > + > +static const struct file_operations fops = { > + .owner = THIS_MODULE, > + DRM_GEM_FOPS, > + .show_fdinfo = msm_fop_show_fdinfo, > +}; > > static const struct drm_driver msm_driver = { > .driver_features = DRIVER_GEM | > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index 244511f85044..f99292eaf529 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -4,6 +4,8 @@ > * Author: Rob Clark > */ > > +#include "drm/drm_drv.h" > + > #include "msm_gpu.h" > #include "msm_gem.h" > #include "msm_mmu.h" > @@ -146,6 +148,16 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu) > return 0; > } > > +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); > +} > + > int msm_gpu_hw_init(struct msm_gpu *gpu) > { > int ret; > @@ -652,7 +664,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, > { > int index = submit->seqno % MSM_GPU_SUBMIT_STATS_COUNT; > volatile struct msm_gpu_submit_stats *stats; > - u64 elapsed, clock = 0; > + u64 elapsed, clock = 0, cycles; > unsigned long flags; > > stats = &ring->memptrs->stats[index]; > @@ -660,12 +672,17 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, > elapsed = (stats->alwayson_end - stats->alwayson_start) * 10000; > do_div(elapsed, 192); > > + cycles = stats->cpcycles_end - stats->cpcycles_start; > + > /* Calculate the clock frequency from the number of CP cycles */ > if (elapsed) { > - clock = (stats->cpcycles_end - stats->cpcycles_start) * 1000; > + clock = cycles * 1000; > do_div(clock, elapsed); > } > > + submit->queue->ctx->elapsed_ns += elapsed; > + submit->queue->ctx->cycles += cycles; > + > trace_msm_gpu_submit_retired(submit, elapsed, clock, > stats->alwayson_start, stats->alwayson_end); > > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > index 6def00883046..4911943ba53b 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.h > +++ b/drivers/gpu/drm/msm/msm_gpu.h > @@ -361,6 +361,22 @@ struct msm_file_private { > /** cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE */ > char *cmdline; > > + /** > + * elapsed: > + * > + * The total (cumulative) elapsed time GPU was busy with rendering > + * from this context in ns. > + */ > + uint64_t elapsed_ns; > + > + /** > + * cycles: > + * > + * The total (cumulative) GPU cycles elapsed attributed to this > + * context. > + */ > + uint64_t cycles; > + > /** > * entities: > * > @@ -544,6 +560,9 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 lo, u32 hi, u64 val) > int msm_gpu_pm_suspend(struct msm_gpu *gpu); > int msm_gpu_pm_resume(struct msm_gpu *gpu); > > +void msm_gpu_show_fdinfo(struct msm_gpu *gpu, struct msm_file_private *ctx, > + struct drm_printer *p); > + > int msm_submitqueue_init(struct drm_device *drm, struct msm_file_private *ctx); > struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *ctx, > u32 id); -- With best wishes Dmitry