From nobody Sun Apr 26 08:21:22 2026 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 16D93C433EF for ; Tue, 21 Jun 2022 07:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345570AbiFUHVU (ORCPT ); Tue, 21 Jun 2022 03:21:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346482AbiFUHVR (ORCPT ); Tue, 21 Jun 2022 03:21:17 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E2F622505 for ; Tue, 21 Jun 2022 00:21:16 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id g25so25492090ejh.9 for ; Tue, 21 Jun 2022 00:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0/EcOWoOuIse/hvQ+oqlKU0lIbd1LkUUo/9oXAhtRbA=; b=LbqdqeXvHaDpcKkgE/5jv+iHaxhFG8nHt/LObC0/wQM2dlGqKWQOjxpybNl5ITV3iq x1Q21GlBZTG7ZRClnkl/fwWPfdFoVI6CEVRgLoOZIWpXmF/dC9slhtFk8kouyhUVDAsM afEUozQ9hP7y5yXYOx0YTjKr9uRDE2mvy1J7CGdIqPHY0ohi53Qny8COHRDq3l0ARJdG 12/Gs94gSu6Ku1rAh3V7dWRL4xuk+UGyqh2hJqu0lAdXrQHwiWI/UOt+j4KM4w5jUg4Y DIAeoPToqPDmBke/w9hrwvmD3qn6L2zggRtq+yt646Z1mOnLwW3AZUD37Qk113pKiMsk bmIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0/EcOWoOuIse/hvQ+oqlKU0lIbd1LkUUo/9oXAhtRbA=; b=UkWLiGyY97aNpNJpXo9PMNwmnVmRxjDg+tjwg2NXG5fsJL4XuiXJv8jGjg6zz9Py01 R3+h67TVoLi01nAsaUCdCM8bBJejhkuUy4Z9O3dvmy/HHIrLHTJ0KhXTFL4habo/LCfv FcuJ3Y3Gty5NTG2DYMPzooe6/tAjZEM2El9dBXF225VX/34rFNAF5QXnuDDNOmLL/tvQ QcHirbbzPqW2fehFqXJeQp5pRzmi5BJb+0g3OQA+DzZ99PLtecQwMTm5giShdvgL+CVF PdvysO5RQxXHbXxsqrtcCNx2jd5ACSrvNt1l2mTAp+4cFLEw2F84HS5wZIuAnstfldGc Q2ng== X-Gm-Message-State: AJIora9+JQTIOX0hmaj+JRZQ05hWEmeJuio1ibWwf42iteoNUDBdBjIK WPVdmqmWeTHpv9uCfLgwFAevhfsGvdY= X-Google-Smtp-Source: AGRyM1vmykp6H3Y7haeFNYSTgDp2SeGPwB5hGbzrZ2Avqa/HZIDol+cs2KIbjm2MU5/hGGmzXs8DNQ== X-Received: by 2002:a17:906:51d6:b0:712:c9:8a1b with SMTP id v22-20020a17090651d600b0071200c98a1bmr25086132ejk.656.1655796074886; Tue, 21 Jun 2022 00:21:14 -0700 (PDT) Received: from localhost.localdomain.info (62-178-82-229.cable.dynamic.surfer.at. [62.178.82.229]) by smtp.gmail.com with ESMTPSA id p1-20020a17090653c100b00722e771007fsm50711ejo.37.2022.06.21.00.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 00:21:14 -0700 (PDT) From: Christian Gmeiner To: linux-kernel@vger.kernel.org Cc: Christian Gmeiner , Lucas Stach , Russell King , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP) Subject: [PATCH v2 1/4] drm/etnaviv: add simple moving average (SMA) Date: Tue, 21 Jun 2022 09:20:47 +0200 Message-Id: <20220621072050.76229-2-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621072050.76229-1-christian.gmeiner@gmail.com> References: <20220621072050.76229-1-christian.gmeiner@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds a SMA algorithm inspired by Exponentially weighted moving average (EWMA) algorithm found in the kernel. Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_sma.h | 53 +++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_sma.h diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sma.h b/drivers/gpu/drm/etnavi= v/etnaviv_sma.h new file mode 100644 index 000000000000..81564d5cbdc3 --- /dev/null +++ b/drivers/gpu/drm/etnaviv/etnaviv_sma.h @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2020 Etnaviv Project + */ + +#ifndef __ETNAVIV_SMA_H__ +#define __ETNAVIV_SMA_H__ + +#include +#include + +/* + * Simple moving average (SMA) + * + * This implements a fixed-size SMA algorithm. + * + * The first argument to the macro is the name that will be used + * for the struct and helper functions. + * + * The second argument, the samples, expresses how many samples are + * used for the SMA algorithm. + */ + +#define DECLARE_SMA(name, _samples) \ + struct sma_##name { \ + unsigned long pos; \ + unsigned long sum; \ + unsigned long samples[_samples]; \ + }; \ + static inline void sma_##name##_init(struct sma_##name *s) \ + { \ + BUILD_BUG_ON(!__builtin_constant_p(_samples)); \ + memset(s, 0, sizeof(struct sma_##name)); \ + } \ + static inline unsigned long sma_##name##_read(struct sma_##name *s) \ + { \ + BUILD_BUG_ON(!__builtin_constant_p(_samples)); \ + return s->sum / _samples; \ + } \ + static inline void sma_##name##_add(struct sma_##name *s, unsigned lon= g val) \ + { \ + unsigned long pos =3D READ_ONCE(s->pos); \ + unsigned long sum =3D READ_ONCE(s->sum); \ + unsigned long sample =3D READ_ONCE(s->samples[pos]); \ + \ + BUILD_BUG_ON(!__builtin_constant_p(_samples)); \ + \ + WRITE_ONCE(s->sum, sum - sample + val); \ + WRITE_ONCE(s->samples[pos], val); \ + WRITE_ONCE(s->pos, pos + 1 =3D=3D _samples ? 0 : pos + 1); \ + } + +#endif /* __ETNAVIV_SMA_H__ */ --=20 2.36.1 From nobody Sun Apr 26 08:21:22 2026 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 00468C433EF for ; Tue, 21 Jun 2022 07:21:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346441AbiFUHV3 (ORCPT ); Tue, 21 Jun 2022 03:21:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346909AbiFUHVY (ORCPT ); Tue, 21 Jun 2022 03:21:24 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 633D22252C for ; Tue, 21 Jun 2022 00:21:23 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id fu3so25522858ejc.7 for ; Tue, 21 Jun 2022 00:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M7igW8eszoZT6WZ3jDv76+6QMOtlL+86zPzbbKCOfSA=; b=eCQeZXQB7xHXjg5HtLoVc2TBHIMAHPj9t7+hAnRAUCOSZy4FapwHBeTK+seVoxtqJJ 6rQCKTF7n8sOSOPNBoEGJHgc2aJ+9EA3RVcEaK2772ILxOAXVcyIRraQ8zkW9EWmKjDZ ass9XC8I659suvHKM+CGqadKqHljxn3TK4m6VMMOeYr3mUI/Ski0gWDlvSyuZQo+MwEx 7wsF7oWJRcnn3srgcQGIYSPH+jOstEl/RLIvzrr8AlYA3SViC21qMIR83sJmHQEDf9Fb bvxfFZAR64p7yuW2pPJtgVU7dQUOGU+pKb5aEc9JeIFR3Skd0i2Px8D82jm8TSEgff14 YhYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M7igW8eszoZT6WZ3jDv76+6QMOtlL+86zPzbbKCOfSA=; b=DkoqMaWidUc07ot9bxUw+Gw0vHsqausIokkoK5N4dZbvhUEaia2FtHRR5GT2L/yYwb G+0ILVV6C0xpo/EeSw5wTuw6lOiTKokGye8e1X/CubdlZEcplvqzGPX/OWBTYvF/SGYK 2twaZJD8hbclXHIfKq/if2L4rbD2WDJoU5eSVuefQxzXhBeBy5U7mGCINWBPpFDKwjWY kQILtHu2FKegMRIPTYRscGXeKpnNwatvilwp+gu4Qla0B1YIpx7SdiDivlBuKV9Ti2oG t37I4BQopSR58RrehApVfS/+M2TjZtM/6jDJYzzVP1pxJ7X8MFbJW0f1yWZeSdisDCrK LWhQ== X-Gm-Message-State: AJIora+2pGrl3E1KtUkIQjX6+w9bE/TilN1pKt+au0Zt2FBcGLBnNf9/ ZlrzovhvSJMWYIE5GGW7JQbJ1HjN4k0= X-Google-Smtp-Source: AGRyM1v1tW2mODL88pIyRoU3mVOnBn6xxAxaFrLbYGlVQ9TPCoJgVAwG+uQU40Icvlmuf14MrGxgFA== X-Received: by 2002:a17:906:5187:b0:712:477:df9b with SMTP id y7-20020a170906518700b007120477df9bmr24526440ejk.424.1655796076836; Tue, 21 Jun 2022 00:21:16 -0700 (PDT) Received: from localhost.localdomain.info (62-178-82-229.cable.dynamic.surfer.at. [62.178.82.229]) by smtp.gmail.com with ESMTPSA id p1-20020a17090653c100b00722e771007fsm50711ejo.37.2022.06.21.00.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 00:21:15 -0700 (PDT) From: Christian Gmeiner To: linux-kernel@vger.kernel.org Cc: Christian Gmeiner , Lucas Stach , Russell King , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP) Subject: [PATCH v2 2/4] drm/etnaviv: add loadavg accounting Date: Tue, 21 Jun 2022 09:20:48 +0200 Message-Id: <20220621072050.76229-3-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621072050.76229-1-christian.gmeiner@gmail.com> References: <20220621072050.76229-1-christian.gmeiner@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The GPU has an idle state register where each bit represents the idle state of a sub-GPU component like FE or TX. Sample this register every 10ms and calculate a simple moving average over the sub-GPU component idle states with a total observation time frame of 1s. This provides us with a percentage based load of each sub-GPU component. Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 14 ++++++ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 64 ++++++++++++++++++++++++++- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 37 ++++++++++++++++ 3 files changed, 114 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnavi= v/etnaviv_drv.c index 1d2b4fb4bcf8..d5c6115e56bd 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -46,6 +46,19 @@ static void load_gpu(struct drm_device *dev) } } =20 +static void unload_gpu(struct drm_device *dev) +{ + struct etnaviv_drm_private *priv =3D dev->dev_private; + unsigned int i; + + for (i =3D 0; i < ETNA_MAX_PIPES; i++) { + struct etnaviv_gpu *g =3D priv->gpu[i]; + + if (g) + etnaviv_gpu_shutdown(g); + } +} + static int etnaviv_open(struct drm_device *dev, struct drm_file *file) { struct etnaviv_drm_private *priv =3D dev->dev_private; @@ -557,6 +570,7 @@ static void etnaviv_unbind(struct device *dev) struct drm_device *drm =3D dev_get_drvdata(dev); struct etnaviv_drm_private *priv =3D drm->dev_private; =20 + unload_gpu(drm); drm_dev_unregister(drm); =20 component_unbind_all(dev, drm); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnavi= v/etnaviv_gpu.c index 37018bc55810..202002ae75ee 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -27,6 +27,8 @@ #include "state_hi.xml.h" #include "cmdstream.xml.h" =20 +static const ktime_t loadavg_polling_frequency =3D 10 * NSEC_PER_MSEC; + static const struct platform_device_id gpu_ids[] =3D { { .name =3D "etnaviv-gpu,2d" }, { }, @@ -745,6 +747,32 @@ static void etnaviv_gpu_hw_init(struct etnaviv_gpu *gp= u) gpu_write(gpu, VIVS_HI_INTR_ENBL, ~0U); } =20 +static enum hrtimer_restart etnaviv_loadavg_function(struct hrtimer *t) +{ + struct etnaviv_gpu *gpu =3D container_of(t, struct etnaviv_gpu, loadavg_t= imer); + const u32 idle =3D gpu_read(gpu, VIVS_HI_IDLE_STATE); + int i; + + gpu->loadavg_last_sample_time =3D ktime_get(); + + for (i =3D 0; i < ARRAY_SIZE(etna_idle_module_names); i++) + if ((idle & etna_idle_module_names[i].bit)) + sma_loadavg_add(&gpu->loadavg_value[i], 0); + else + sma_loadavg_add(&gpu->loadavg_value[i], 100); + + spin_lock(&gpu->loadavg_spinlock); + + for (i =3D 0; i < ARRAY_SIZE(etna_idle_module_names); i++) + gpu->loadavg_percentage[i] =3D sma_loadavg_read(&gpu->loadavg_value[i]); + + spin_unlock(&gpu->loadavg_spinlock); + + hrtimer_forward_now(t, loadavg_polling_frequency); + + return HRTIMER_RESTART; +} + int etnaviv_gpu_init(struct etnaviv_gpu *gpu) { struct etnaviv_drm_private *priv =3D gpu->drm->dev_private; @@ -839,6 +867,11 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) for (i =3D 0; i < ARRAY_SIZE(gpu->event); i++) complete(&gpu->event_free); =20 + /* Setup loadavg timer */ + hrtimer_init(&gpu->loadavg_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_SOFT); + gpu->loadavg_timer.function =3D etnaviv_loadavg_function; + hrtimer_start(&gpu->loadavg_timer, loadavg_polling_frequency, HRTIMER_MOD= E_ABS_SOFT); + /* Now program the hardware */ mutex_lock(&gpu->lock); etnaviv_gpu_hw_init(gpu); @@ -859,6 +892,11 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) return ret; } =20 +void etnaviv_gpu_shutdown(struct etnaviv_gpu *gpu) +{ + hrtimer_cancel(&gpu->loadavg_timer); +} + #ifdef CONFIG_DEBUG_FS struct dma_debug { u32 address[2]; @@ -1585,6 +1623,8 @@ int etnaviv_gpu_wait_idle(struct etnaviv_gpu *gpu, un= signed int timeout_ms) static int etnaviv_gpu_hw_suspend(struct etnaviv_gpu *gpu) { if (gpu->initialized && gpu->fe_running) { + hrtimer_cancel(&gpu->loadavg_timer); + /* Replace the last WAIT with END */ mutex_lock(&gpu->lock); etnaviv_buffer_end(gpu); @@ -1608,7 +1648,8 @@ static int etnaviv_gpu_hw_suspend(struct etnaviv_gpu = *gpu) #ifdef CONFIG_PM static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu) { - int ret; + s64 missing_samples; + int ret, i, j; =20 ret =3D mutex_lock_killable(&gpu->lock); if (ret) @@ -1617,7 +1658,27 @@ static int etnaviv_gpu_hw_resume(struct etnaviv_gpu = *gpu) etnaviv_gpu_update_clock(gpu); etnaviv_gpu_hw_init(gpu); =20 + /* Update loadavg based on delta of suspend and resume ktime. + * + * Our SMA algorithm uses a fixed size of 100 items to be able + * to calculate the mean over one second as we sample every 10ms. + */ + missing_samples =3D div_s64(ktime_ms_delta(ktime_get(), gpu->loadavg_last= _sample_time), 10); + missing_samples =3D min(missing_samples, (s64)100); + + spin_lock_bh(&gpu->loadavg_spinlock); + + for (i =3D 0; i < ARRAY_SIZE(etna_idle_module_names); i++) { + struct sma_loadavg *loadavg =3D &gpu->loadavg_value[i]; + + for (j =3D 0; j < missing_samples; j++) + sma_loadavg_add(loadavg, 0); + } + + spin_unlock_bh(&gpu->loadavg_spinlock); + mutex_unlock(&gpu->lock); + hrtimer_start(&gpu->loadavg_timer, loadavg_polling_frequency, HRTIMER_MOD= E_ABS_SOFT); =20 return 0; } @@ -1787,6 +1848,7 @@ static int etnaviv_gpu_platform_probe(struct platform= _device *pdev) gpu->dev =3D &pdev->dev; mutex_init(&gpu->lock); mutex_init(&gpu->fence_lock); + spin_lock_init(&gpu->loadavg_spinlock); =20 /* Map registers: */ gpu->mmio =3D devm_platform_ioremap_resource(pdev, 0); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnavi= v/etnaviv_gpu.h index 85eddd492774..881f071f640e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h @@ -10,6 +10,8 @@ #include "etnaviv_gem.h" #include "etnaviv_mmu.h" #include "etnaviv_drv.h" +#include "etnaviv_sma.h" +#include "state_hi.xml.h" =20 struct etnaviv_gem_submit; struct etnaviv_vram_mapping; @@ -91,6 +93,33 @@ struct clk; =20 #define ETNA_NR_EVENTS 30 =20 +DECLARE_SMA(loadavg, 100) + +static const struct { + const char *name; + u32 bit; +} etna_idle_module_names[] =3D { + { "FE", VIVS_HI_IDLE_STATE_FE }, + { "DE", VIVS_HI_IDLE_STATE_DE }, + { "PE", VIVS_HI_IDLE_STATE_PE }, + { "SH", VIVS_HI_IDLE_STATE_SH }, + { "PA", VIVS_HI_IDLE_STATE_PA }, + { "SE", VIVS_HI_IDLE_STATE_SE }, + { "RA", VIVS_HI_IDLE_STATE_RA }, + { "TX", VIVS_HI_IDLE_STATE_TX }, + { "VG", VIVS_HI_IDLE_STATE_VG }, + { "IM", VIVS_HI_IDLE_STATE_IM }, + { "FP", VIVS_HI_IDLE_STATE_FP }, + { "TS", VIVS_HI_IDLE_STATE_TS }, + { "BL", VIVS_HI_IDLE_STATE_BL }, + { "ASYNCFE", VIVS_HI_IDLE_STATE_ASYNCFE }, + { "MC", VIVS_HI_IDLE_STATE_MC }, + { "PPA", VIVS_HI_IDLE_STATE_PPA }, + { "WD", VIVS_HI_IDLE_STATE_WD }, + { "NN", VIVS_HI_IDLE_STATE_NN }, + { "TP", VIVS_HI_IDLE_STATE_TP }, +}; + struct etnaviv_gpu { struct drm_device *drm; struct thermal_cooling_device *cooling; @@ -147,6 +176,13 @@ struct etnaviv_gpu { unsigned int freq_scale; unsigned long base_rate_core; unsigned long base_rate_shader; + + /* Loadavg: */ + struct hrtimer loadavg_timer; + spinlock_t loadavg_spinlock; + ktime_t loadavg_last_sample_time; + struct sma_loadavg loadavg_value[ARRAY_SIZE(etna_idle_module_names)]; + unsigned int loadavg_percentage[ARRAY_SIZE(etna_idle_module_names)]; }; =20 static inline void gpu_write(struct etnaviv_gpu *gpu, u32 reg, u32 data) @@ -162,6 +198,7 @@ static inline u32 gpu_read(struct etnaviv_gpu *gpu, u32= reg) int etnaviv_gpu_get_param(struct etnaviv_gpu *gpu, u32 param, u64 *value); =20 int etnaviv_gpu_init(struct etnaviv_gpu *gpu); +void etnaviv_gpu_shutdown(struct etnaviv_gpu *gpu); bool etnaviv_fill_identity_from_hwdb(struct etnaviv_gpu *gpu); =20 #ifdef CONFIG_DEBUG_FS --=20 2.36.1 From nobody Sun Apr 26 08:21:22 2026 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 E6EE3C433EF for ; Tue, 21 Jun 2022 07:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346303AbiFUHV0 (ORCPT ); Tue, 21 Jun 2022 03:21:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345963AbiFUHVW (ORCPT ); Tue, 21 Jun 2022 03:21:22 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4140A22530 for ; Tue, 21 Jun 2022 00:21:21 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id cw10so1784159ejb.3 for ; Tue, 21 Jun 2022 00:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ujXg7tbiFKFG9Xv1lpmXMbIqHNMRftScv0fuP2to1p4=; b=mR7SSvzxKBsVGWmW7rKMKm11PMO2JzWQjOvgSCKOXzUg76jvtygFg5Ko/iBLe/V5YM qEnz0PtDiVTbLZx2GOQDDGhJuxgco2xipCkiF1Snhg/1/sGCA9d8964K1JqVJG1d5gyi XBubX7jmbgcsPTuJ+Ll442ofRMaJoAwFI5nyCTm1Cw+XnTgZms5IVuJA/brnu1jG5XyA XvKRmT9CSL/9+Xziz1C5p63hIIuZSayprT+g1+uLzd+TJrhW30vVobsB1qZJnYf6XFIN c9E2RkMqxJwoROp9op4RIbSwNQfOZ47tSX74h3knzx2GIQNdn24NvgRGIFzWqP2oAjE9 fXYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ujXg7tbiFKFG9Xv1lpmXMbIqHNMRftScv0fuP2to1p4=; b=W1o74Mdt771ovfRg7zPjNUAvcje9lJKnxMR+m9xV5e2IsaRLwsAl3O9skAbQOVRQlY Df4BR3/+At5GViQ3ndpaPu6Z/tf+v9XSCAWoYLxnOApA2OCpAXahFaS4prT9NmLI1eqr xeQaqetk+fRENln2IBTvWdYJug47K7E70qyIJZ8VF5iHoAD79tTi8SA8zkfHMDad2HRl yJ0sA3ic8Lo8J3gKGIPyBJKZkv9DXHN6oKZbWFuyg9GZuI4egeRDydXYnUMTu7dFgFZS UuBXEARgPXKnNbEAK136fChNsvQyzi2XErYUQrjZ/qFu1JNM4JnLs+9kFcWkS+YcDsNf CzGg== X-Gm-Message-State: AJIora8S20L8qGpZdC+rqvCZ48hqtcBkODJ9FVgUAzWcAAl0vNYf8mvU ZO5+gjCMZKTkvHmFPEyG+W30+GvZWP4= X-Google-Smtp-Source: AGRyM1vCyhurjoTwHqtO0qcT9zB5pBmZ/2iCYJki53eJ3YCFskGqaVpFKRg+a2h4X0orIH6PALuMag== X-Received: by 2002:a17:907:7daa:b0:720:b3e1:12b7 with SMTP id oz42-20020a1709077daa00b00720b3e112b7mr14304301ejc.11.1655796079661; Tue, 21 Jun 2022 00:21:19 -0700 (PDT) Received: from localhost.localdomain.info (62-178-82-229.cable.dynamic.surfer.at. [62.178.82.229]) by smtp.gmail.com with ESMTPSA id p1-20020a17090653c100b00722e771007fsm50711ejo.37.2022.06.21.00.21.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 00:21:19 -0700 (PDT) From: Christian Gmeiner To: linux-kernel@vger.kernel.org Cc: Christian Gmeiner , Lucas Stach , Russell King , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP) Subject: [PATCH v2 3/4] drm/etnaviv: show loadavg in debugfs Date: Tue, 21 Jun 2022 09:20:49 +0200 Message-Id: <20220621072050.76229-4-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621072050.76229-1-christian.gmeiner@gmail.com> References: <20220621072050.76229-1-christian.gmeiner@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Might be helpful to see the loadavg in debugfs. Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnavi= v/etnaviv_gpu.c index 202002ae75ee..113faff9b02e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -926,7 +926,7 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct= seq_file *m) { struct dma_debug debug; u32 dma_lo, dma_hi, axi, idle; - int ret; + int ret, i; =20 seq_printf(m, "%s Status:\n", dev_name(gpu->dev)); =20 @@ -1044,6 +1044,16 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, str= uct seq_file *m) if (idle & VIVS_HI_IDLE_STATE_AXI_LP) seq_puts(m, "\t AXI low power mode\n"); =20 + seq_printf(m, "\tload:\n"); + spin_lock_bh(&gpu->loadavg_spinlock); + + for (i =3D 0; i < ARRAY_SIZE(etna_idle_module_names); i++) + seq_printf(m, "\t %s: %u%%\n", + etna_idle_module_names[i].name, + gpu->loadavg_percentage[i]); + + spin_unlock_bh(&gpu->loadavg_spinlock); + if (gpu->identity.features & chipFeatures_DEBUG_MODE) { u32 read0 =3D gpu_read(gpu, VIVS_MC_DEBUG_READ0); u32 read1 =3D gpu_read(gpu, VIVS_MC_DEBUG_READ1); --=20 2.36.1 From nobody Sun Apr 26 08:21:22 2026 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 C54B3C433EF for ; Tue, 21 Jun 2022 07:21:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347029AbiFUHVi (ORCPT ); Tue, 21 Jun 2022 03:21:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346917AbiFUHVY (ORCPT ); Tue, 21 Jun 2022 03:21:24 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3758F2253E for ; Tue, 21 Jun 2022 00:21:24 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id cf14so8327020edb.8 for ; Tue, 21 Jun 2022 00:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C/NKEAt2Er4quLZ5gjnADzbiK7ybSix+76D1rb8z9Fw=; b=Aosb52+hrSp+NPKOBpkKo+HEpLAjK6Cy41ZXxhSPtBSqnk3xiW5XK+YkC1wTawZ3PX Rg0witFuSx8IGBu5tFPCDFIbRKZWIN6OEc60DpQLjXdIOtPdpZ+9tk1hsR8vmpK9Oqb+ qzYFblMRhzKHKrgWXx48VO1dgBn7weLem/f+BIetEfiZNBlOfeKAbR560Dw+l8usmNFx zDqNU63Wd7veZo9Y0bODMqID/93UPNX7JmMvzuusJvJT5h7SZlV4kAxZ6RChrclrzwUB cRk+nJnExHGPX9Ll71IH+4hfgMpqXQ5u5CiTTdepjp1vYvEtV5bR4SfiVgE6u5YpPPdY hZgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C/NKEAt2Er4quLZ5gjnADzbiK7ybSix+76D1rb8z9Fw=; b=vU2eaHeVs0T5e3/m9mqXiKpUaste81++NhSB7B4hZHRHaMyO95vlaMutCOXl5yYRRZ bjtlJGiLrfNie0XixP1D+7HORu/G7ol2bpHRinJuvKcNHmShW4AmXSgwVPFrIPJl9O+b pEHrEjAneTkyX9K3K7xcNZGCBKPj212OCgcu9SdfG2Xv0HxqCc6nKlxlrx24bN4jDYO2 z95rEFYtBq5uoyccMXMW/8j4KEyecHQ0tLWek+uxmPX/QLul2UrghzBnC9NzD2RoNyga mJ1nV7M91bzt5A1vUFdzSkFaixnZT26k+KTAtsxhOxHEQWshREcdUH+gARpiQiE6r61n 06+A== X-Gm-Message-State: AJIora/ES4oe1YCsrXdYdwHDHeVBqF507bm/s465RIaSGWsJEt2eG0LB DMQgQWRvpuJ/++UVTeBKYobkVJRVPV0= X-Google-Smtp-Source: AGRyM1v2Ep/cdmiqnkH6Ncpgbtcv2HEnrlZXGr9tHs+YsIyubDQfduplz2GQ4Wt6a/8Lw+p3B4StFw== X-Received: by 2002:aa7:d294:0:b0:435:5d12:867f with SMTP id w20-20020aa7d294000000b004355d12867fmr25960856edq.147.1655796082489; Tue, 21 Jun 2022 00:21:22 -0700 (PDT) Received: from localhost.localdomain.info (62-178-82-229.cable.dynamic.surfer.at. [62.178.82.229]) by smtp.gmail.com with ESMTPSA id p1-20020a17090653c100b00722e771007fsm50711ejo.37.2022.06.21.00.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 00:21:22 -0700 (PDT) From: Christian Gmeiner To: linux-kernel@vger.kernel.org Cc: Christian Gmeiner , Lucas Stach , Russell King , David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org (moderated list:DRM DRIVERS FOR VIVANTE GPU IP), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR VIVANTE GPU IP) Subject: [PATCH v2 4/4] drm/etnaviv: export loadavg via perfmon Date: Tue, 21 Jun 2022 09:20:50 +0200 Message-Id: <20220621072050.76229-5-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621072050.76229-1-christian.gmeiner@gmail.com> References: <20220621072050.76229-1-christian.gmeiner@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Make it possible to access the sub-GPU component load value from user space with the perfmon infrastructure. Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 79 +++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/et= naviv/etnaviv_perfmon.c index bafdfe49c1d8..d65d9af3a74a 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c @@ -120,6 +120,19 @@ static u32 hi_total_idle_cycle_read(struct etnaviv_gpu= *gpu, return gpu_read(gpu, reg); } =20 +static u32 load_read(struct etnaviv_gpu *gpu, + const struct etnaviv_pm_domain *domain, + const struct etnaviv_pm_signal *signal) +{ + u32 load; + + spin_lock_bh(&gpu->loadavg_spinlock); + load =3D gpu->loadavg_percentage[signal->data]; + spin_unlock_bh(&gpu->loadavg_spinlock); + + return load; +} + static const struct etnaviv_pm_domain doms_3d[] =3D { { .name =3D "HI", @@ -419,6 +432,72 @@ static const struct etnaviv_pm_domain doms_3d[] =3D { &perf_reg_read } } + }, + { + .name =3D "LOAD", + .nr_signals =3D 12, + .signal =3D (const struct etnaviv_pm_signal[]) { + { + "FE", + 0, + &load_read + }, + { + "DE", + 1, + &load_read + }, + { + "PE", + 2, + &load_read + }, + { + "SH", + 3, + &load_read + }, + { + "PA", + 4, + &load_read + }, + { + "SE", + 5, + &load_read + }, + { + "RA", + 6, + &load_read + }, + { + "TX", + 7, + &load_read + }, + { + "VG", + 8, + &load_read + }, + { + "IM", + 9, + &load_read + }, + { + "FP", + 10, + &load_read + }, + { + "TS", + 11, + &load_read + } + } } }; =20 --=20 2.36.1