admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/panthor: call into devfreq for current frequency

Browse Source 
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: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Karunika Choo <karunika.choo@arm.com>
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Link: https://patch.msgid.link/20251017-mt8196-gpufreq-v8-3-98fc1cc566a1@collabora.com
Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
This commit is contained in:
Nicolas Frattaroli
2025-10-17 17:31:10 +02:00
committed by Liviu Dudau
parent 12c069e072
commit 3dd4844ba0
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/panthor/panthor_devfreq.c
View File

@@ -63,7 +63,6 @@ static void panthor_devfreq_update_utilization(struct panthor_devfreq *pdevfreq)
static int panthor_devfreq_target(struct device *dev, unsigned long *freq,
u32 flags)
{
struct panthor_device *ptdev = dev_get_drvdata(dev);
struct dev_pm_opp *opp;
int err;
@@ -73,8 +72,6 @@ static int panthor_devfreq_target(struct device *dev, unsigned long *freq,
dev_pm_opp_put(opp);
err = dev_pm_opp_set_rate(dev, *freq);
if (!err)
ptdev->current_frequency = *freq;
return err;
}
@@ -116,11 +113,21 @@ static int panthor_devfreq_get_dev_status(struct device *dev,
return 0;
}
static int panthor_devfreq_get_cur_freq(struct device *dev, unsigned long *freq)
{
struct panthor_device *ptdev = dev_get_drvdata(dev);
*freq = clk_get_rate(ptdev->clks.core);
return 0;
}
static struct devfreq_dev_profile panthor_devfreq_profile = {
.timer = DEVFREQ_TIMER_DELAYED,
.polling_ms = 50, /* ~3 frames */
.target = panthor_devfreq_target,
.get_dev_status = panthor_devfreq_get_dev_status,
.get_cur_freq = panthor_devfreq_get_cur_freq,
};
int panthor_devfreq_init(struct panthor_device *ptdev)
@@ -198,7 +205,6 @@ int panthor_devfreq_init(struct panthor_device *ptdev)
return PTR_ERR(opp);
panthor_devfreq_profile.initial_freq = cur_freq;
ptdev->current_frequency = cur_freq;
/*
* Set the recommend OPP this will enable and configure the regulator
@@ -296,3 +302,19 @@ void panthor_devfreq_record_idle(struct panthor_device *ptdev)
spin_unlock_irqrestore(&pdevfreq->lock, irqflags);
}
unsigned long panthor_devfreq_get_freq(struct panthor_device *ptdev)
{
struct panthor_devfreq *pdevfreq = ptdev->devfreq;
unsigned long freq = 0;
int ret;
if (!pdevfreq->devfreq)
return 0;
ret = pdevfreq->devfreq->profile->get_cur_freq(ptdev->base.dev, &freq);
if (ret)
return 0;
return freq;
}

2
drivers/gpu/drm/panthor/panthor_devfreq.h
View File

@@ -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);
unsigned long panthor_devfreq_get_freq(struct panthor_device *ptdev);
#endif /* __PANTHOR_DEVFREQ_H__ */

3
drivers/gpu/drm/panthor/panthor_device.h
View File

@@ -214,9 +214,6 @@ struct panthor_device {
/** @profile_mask: User-set profiling flags for job accounting. */
u32 profile_mask;
/** @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;

4
drivers/gpu/drm/panthor/panthor_drv.c
View File

@@ -26,6 +26,7 @@
#include <drm/gpu_scheduler.h>
#include <drm/panthor_drm.h>
#include "panthor_devfreq.h"
#include "panthor_device.h"
#include "panthor_fw.h"
#include "panthor_gem.h"
@@ -1520,7 +1521,8 @@ static void panthor_gpu_show_fdinfo(struct panthor_device *ptdev,
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);
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));
}
static void panthor_show_internal_memory_stats(struct drm_printer *p, struct drm_file *file)