On Thu, 19 Nov 2026 15:45:57 +0000 Karunika Choo <[email protected]> wrote:
> On Mali v15 AM systems, frequency scaling is handled outside panthor by > the AM_GOVERNOR block, so the GPU DT node may not provide an OPP table. > > Add generic devfreq_disabled field to panthor_soc_data to allow > disabling of devfreq for other use GPUs and make panthor_devfreq_init() > return early when this flag is set. Ensure frequency can be queried > without devfreq instance and omit drm-maxfreq-panthor from fdinfo when > the maximum frequency is unknown. > > Signed-off-by: Karunika Choo <[email protected]> Reviewed-by: Boris Brezillon <[email protected]> > --- > v4: > - Use panthor_soc_data flags instead of compatible to allow earlier GPUs > to also disable devfreq. Resetting R-bs as a result. > v3: > - Omit drm-maxfreq-panthor from fdinfo when the maximum frequency > is unknown, as on AM systems without an OPP table. > v2: > - Directly call functions instead of storing function pointers. > - Picked up R-b from Liviu > v1: > - Only skip panthor_devfreq init when OPP lookup returns -ENODEV instead > of direct DT-property check. > - Support frequency query without devfreq. > > drivers/gpu/drm/panthor/panthor_devfreq.c | 9 +++++++-- > drivers/gpu/drm/panthor/panthor_device.h | 3 +++ > drivers/gpu/drm/panthor/panthor_drv.c | 5 ++++- > drivers/gpu/drm/panthor/panthor_hw.h | 10 ++++++++++ > 4 files changed, 24 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/panthor/panthor_devfreq.c > b/drivers/gpu/drm/panthor/panthor_devfreq.c > index 2249b41ca4afe..8b215e24b02c3 100644 > --- a/drivers/gpu/drm/panthor/panthor_devfreq.c > +++ b/drivers/gpu/drm/panthor/panthor_devfreq.c > @@ -12,6 +12,7 @@ > > #include "panthor_devfreq.h" > #include "panthor_device.h" > +#include "panthor_hw.h" > > /** > * struct panthor_devfreq - Device frequency management > @@ -154,6 +155,9 @@ int panthor_devfreq_init(struct panthor_device *ptdev) > > ptdev->devfreq = pdevfreq; > > + if (panthor_hw_is_devfreq_disabled(ptdev)) > + return 0; > + > /* > * The power domain associated with the GPU may have already added an > * OPP table, complete with OPPs, as part of the platform bus > @@ -324,9 +328,10 @@ unsigned long panthor_devfreq_get_freq(struct > panthor_device *ptdev) > int ret; > > if (!pdevfreq->devfreq) > - return 0; > + ret = panthor_devfreq_get_cur_freq(ptdev->base.dev, &freq); > + else > + ret = pdevfreq->devfreq->profile->get_cur_freq(ptdev->base.dev, > &freq); > > - ret = pdevfreq->devfreq->profile->get_cur_freq(ptdev->base.dev, &freq); > if (ret) > return 0; > > diff --git a/drivers/gpu/drm/panthor/panthor_device.h > b/drivers/gpu/drm/panthor/panthor_device.h > index f0a96ff0f13da..31f9341b5aeda 100644 > --- a/drivers/gpu/drm/panthor/panthor_device.h > +++ b/drivers/gpu/drm/panthor/panthor_device.h > @@ -45,6 +45,9 @@ struct panthor_soc_data { > > /** @asn_hash: ASN_HASH values when asn_hash_enable is true. */ > u32 asn_hash[3]; > + > + /** @devfreq_disabled: True if devfreq is handled external to Panthor */ > + bool devfreq_disabled; > }; > > /** > diff --git a/drivers/gpu/drm/panthor/panthor_drv.c > b/drivers/gpu/drm/panthor/panthor_drv.c > index dc8d0191aef42..b4d3d339b04b4 100644 > --- a/drivers/gpu/drm/panthor/panthor_drv.c > +++ b/drivers/gpu/drm/panthor/panthor_drv.c > @@ -1715,7 +1715,10 @@ static void panthor_gpu_show_fdinfo(struct > panthor_device *ptdev, > if (ptdev->profile_mask & PANTHOR_DEVICE_PROFILING_CYCLES) > drm_printf(p, "drm-cycles-panthor:\t%llu\n", > pfile->stats.cycles); > > - drm_printf(p, "drm-maxfreq-panthor:\t%lu Hz\n", ptdev->fast_rate); > + /* Omit the maximum frequency when it is unknown */ > + if (ptdev->fast_rate) > + drm_printf(p, "drm-maxfreq-panthor:\t%lu Hz\n", > ptdev->fast_rate); > + > drm_printf(p, "drm-curfreq-panthor:\t%lu Hz\n", > panthor_devfreq_get_freq(ptdev)); > } > diff --git a/drivers/gpu/drm/panthor/panthor_hw.h > b/drivers/gpu/drm/panthor/panthor_hw.h > index 4cb603a3acef6..f93a6b16df2af 100644 > --- a/drivers/gpu/drm/panthor/panthor_hw.h > +++ b/drivers/gpu/drm/panthor/panthor_hw.h > @@ -95,4 +95,14 @@ static inline bool panthor_hw_has_neural(struct > panthor_device *ptdev) > ptdev->gpu_info.gpu_features & GPU_FEATURES_NX); > } > > +static inline bool panthor_hw_is_devfreq_disabled(struct panthor_device > *ptdev) > +{ > + const struct panthor_soc_data *data = ptdev->soc_data; > + > + if (!data) > + return false; > + > + return data->devfreq_disabled; > +} > + > #endif /* __PANTHOR_HW_H__ */
