From nobody Thu Oct 2 19:27:59 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7CAEA32ED43; Fri, 12 Sep 2025 18:38:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757702316; cv=pass; b=qfXWy8mXXCasI0F9FtVgk8l2U8p7XgIwjgRuPZFJDAOzuk3XV5qNuK8DUqE3APJP/AXVDorobi+PyrF0f04WmzFIkNWXpRQVhaJX9dNvuv8Zp0eMUcyxiDkLMlqE40UImff7lgA/dOhDmFWHiPys+vHX1zOZobS8VvSEV2hi5ck= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757702316; c=relaxed/simple; bh=NqnCKZzhovV7MWMGHtwmCJSKL4qTTHBmssMpVHz5pDo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nlW3TMe8QZx2CjYfLm9/vTM1ITBF0a5k7+ZMqBT1jZj+jdYiBCfe/NsNu6RG80Dvqh3sRYxsqhKvlJeoUU+rS3T9hXI21rE3/BX+anbRlFGTy0sPzE6wEmR9MU5DhTzTkGdOtDkfCIovV50NlgZ9zRXcdhCAJ3RXuspk9kWYK6U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=SHF4Lx+3; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="SHF4Lx+3" ARC-Seal: i=1; a=rsa-sha256; t=1757702290; cv=none; d=zohomail.com; s=zohoarc; b=jCcx5kupcGMQ6qEdeF0fPg45uIPns1+aZza0tsmRTDE6dqGN0tzKR5otE2E7aHxZnWtAhLdTlOZzZJxo4DDPmGP2UlpoRDyyUWp3DkPb0g74IyaeoOAUjyidOhhNrPy6bnSAHkh3GonLWjOeGbj6ngsBZheMc/07x+AE646V578= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757702290; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=t8qb0CjF4TYRjzxh3bLQCf9aGJQh8+bsgUjROmryPOo=; b=JT8+qLfy3Acfr5s9tDKDme3QkuPKKfJOMIiN2+Q1Pd0u5xIfNo420QOgYvoa1/JGe4WEeXqBOE45UGlmXFuZmZVwu3UnL/5Oz+XOqQVsn+YyDCEdKBf8TYvKBu9Bbit/Nk9qE/XsowPBc+d1ijdQz49/B6yiWSAnOTkdEQbif18= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1757702290; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=t8qb0CjF4TYRjzxh3bLQCf9aGJQh8+bsgUjROmryPOo=; b=SHF4Lx+3Zq34d4SGkn2CKwtYjVKUWPGD/Sup1TkvqMk0Q8jwWLCJMvCG887iWArd Uuo6kRpdU1lHPFR0ah7NiGgai1FTDo9dC0v6BxZp/Hnqab8ynCJUAlqGP8f/OUUQ4k5 1ExGo3JwY3ufUj25Bz8DxActLkJ5rwh3BUJDfCtE= Received: by mx.zohomail.com with SMTPS id 1757702288056856.071305666723; Fri, 12 Sep 2025 11:38:08 -0700 (PDT) From: Nicolas Frattaroli Date: Fri, 12 Sep 2025 20:37:05 +0200 Subject: [PATCH v2 06/10] drm/panthor: call into devfreq for current frequency Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250912-mt8196-gpufreq-v2-6-779a8a3729d9@collabora.com> References: <20250912-mt8196-gpufreq-v2-0-779a8a3729d9@collabora.com> In-Reply-To: <20250912-mt8196-gpufreq-v2-0-779a8a3729d9@collabora.com> To: AngeloGioacchino Del Regno , Boris Brezillon , Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , MyungJoo Ham , Kyungmin Park , Chanwoo Choi , Jassi Brar , Kees Cook , "Gustavo A. R. Silva" , Chia-I Wu , Chen-Yu Tsai Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, linux-hardening@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.2 As it stands, panthor keeps a cached current frequency value for when it wants to retrieve it. This doesn't work well for when things might switch frequency without panthor's knowledge. Instead, implement the get_cur_freq operation, and expose it through a helper function to the rest of panthor. Reviewed-by: Steven Price Signed-off-by: Nicolas Frattaroli Reviewed-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/panthor/panthor_devfreq.c | 33 +++++++++++++++++++++++++++= ---- drivers/gpu/drm/panthor/panthor_devfreq.h | 2 ++ drivers/gpu/drm/panthor/panthor_device.h | 3 --- drivers/gpu/drm/panthor/panthor_drv.c | 4 +++- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_devfreq.c b/drivers/gpu/drm/pa= nthor/panthor_devfreq.c index 3686515d368db5bb329f4858d4a7247a4957cc24..8903f60c0a3f06313ac2008791c= 210ff32b6bd52 100644 --- a/drivers/gpu/drm/panthor/panthor_devfreq.c +++ b/drivers/gpu/drm/panthor/panthor_devfreq.c @@ -62,7 +62,6 @@ static void panthor_devfreq_update_utilization(struct pan= thor_devfreq *pdevfreq) static int panthor_devfreq_target(struct device *dev, unsigned long *freq, u32 flags) { - struct panthor_device *ptdev =3D dev_get_drvdata(dev); struct dev_pm_opp *opp; int err; =20 @@ -72,8 +71,6 @@ static int panthor_devfreq_target(struct device *dev, uns= igned long *freq, dev_pm_opp_put(opp); =20 err =3D dev_pm_opp_set_rate(dev, *freq); - if (!err) - ptdev->current_frequency =3D *freq; =20 return err; } @@ -115,11 +112,21 @@ static int panthor_devfreq_get_dev_status(struct devi= ce *dev, return 0; } =20 +static int panthor_devfreq_get_cur_freq(struct device *dev, unsigned long = *freq) +{ + struct panthor_device *ptdev =3D dev_get_drvdata(dev); + + *freq =3D clk_get_rate(ptdev->clks.core); + + return 0; +} + static struct devfreq_dev_profile panthor_devfreq_profile =3D { .timer =3D DEVFREQ_TIMER_DELAYED, .polling_ms =3D 50, /* ~3 frames */ .target =3D panthor_devfreq_target, .get_dev_status =3D panthor_devfreq_get_dev_status, + .get_cur_freq =3D panthor_devfreq_get_cur_freq, }; =20 int panthor_devfreq_init(struct panthor_device *ptdev) @@ -198,7 +205,6 @@ int panthor_devfreq_init(struct panthor_device *ptdev) return PTR_ERR(opp); =20 panthor_devfreq_profile.initial_freq =3D cur_freq; - ptdev->current_frequency =3D cur_freq; =20 /* * Set the recommend OPP this will enable and configure the regulator @@ -296,3 +302,22 @@ void panthor_devfreq_record_idle(struct panthor_device= *ptdev) =20 spin_unlock_irqrestore(&pdevfreq->lock, irqflags); } + +unsigned long panthor_devfreq_get_freq(struct panthor_device *ptdev) +{ + struct panthor_devfreq *pdevfreq =3D ptdev->devfreq; + unsigned long freq =3D 0; + int ret; + + if (!pdevfreq || !pdevfreq->devfreq) + return 0; + + if (pdevfreq->devfreq->profile->get_cur_freq) { + ret =3D pdevfreq->devfreq->profile->get_cur_freq(ptdev->base.dev, + &freq); + if (ret) + return 0; + } + + return freq; +} diff --git a/drivers/gpu/drm/panthor/panthor_devfreq.h b/drivers/gpu/drm/pa= nthor/panthor_devfreq.h index b7631de695f7d79456478c87e8af5dc47673cd1d..f8e29e02f66cb3281ed4bb4c75c= da9bd4df82b92 100644 --- a/drivers/gpu/drm/panthor/panthor_devfreq.h +++ b/drivers/gpu/drm/panthor/panthor_devfreq.h @@ -18,4 +18,6 @@ void panthor_devfreq_suspend(struct panthor_device *ptdev= ); void panthor_devfreq_record_busy(struct panthor_device *ptdev); void panthor_devfreq_record_idle(struct panthor_device *ptdev); =20 +unsigned long panthor_devfreq_get_freq(struct panthor_device *ptdev); + #endif /* __PANTHOR_DEVFREQ_H__ */ diff --git a/drivers/gpu/drm/panthor/panthor_device.h b/drivers/gpu/drm/pan= thor/panthor_device.h index 4fc7cf2aeed577f623aac73ed287d6327645ecaa..a14239c8f9ca9229d8d6d36d327= e6fd6d05f8f2f 100644 --- a/drivers/gpu/drm/panthor/panthor_device.h +++ b/drivers/gpu/drm/panthor/panthor_device.h @@ -200,9 +200,6 @@ struct panthor_device { /** @profile_mask: User-set profiling flags for job accounting. */ u32 profile_mask; =20 - /** @current_frequency: Device clock frequency at present. Set by DVFS*/ - unsigned long current_frequency; - /** @fast_rate: Maximum device clock frequency. Set by DVFS */ unsigned long fast_rate; =20 diff --git a/drivers/gpu/drm/panthor/panthor_drv.c b/drivers/gpu/drm/pantho= r/panthor_drv.c index fdbe89ef7f43c54d705b90275917dfdee16a0152..ba871466d7e05a95b51b3e5bb67= 23c587410f3d8 100644 --- a/drivers/gpu/drm/panthor/panthor_drv.c +++ b/drivers/gpu/drm/panthor/panthor_drv.c @@ -25,6 +25,7 @@ #include #include =20 +#include "panthor_devfreq.h" #include "panthor_device.h" #include "panthor_fw.h" #include "panthor_gem.h" @@ -1519,7 +1520,8 @@ static void panthor_gpu_show_fdinfo(struct panthor_de= vice *ptdev, drm_printf(p, "drm-cycles-panthor:\t%llu\n", pfile->stats.cycles); =20 drm_printf(p, "drm-maxfreq-panthor:\t%lu Hz\n", ptdev->fast_rate); - drm_printf(p, "drm-curfreq-panthor:\t%lu Hz\n", ptdev->current_frequency); + drm_printf(p, "drm-curfreq-panthor:\t%lu Hz\n", + panthor_devfreq_get_freq(ptdev)); } =20 static void panthor_show_internal_memory_stats(struct drm_printer *p, stru= ct drm_file *file) --=20 2.51.0