Commit 3dd4844b authored by Nicolas Frattaroli's avatar Nicolas Frattaroli Committed by Liviu Dudau
Browse files

drm/panthor: call into devfreq for current frequency 



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: default avatarChia-I Wu <olvaffe@gmail.com>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarKarunika Choo <karunika.choo@arm.com>
Reviewed-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Signed-off-by: default avatarNicolas Frattaroli <nicolas.frattaroli@collabora.com>
Link: https://patch.msgid.link/20251017-mt8196-gpufreq-v8-3-98fc1cc566a1@collabora.com


Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
parent 12c069e0

drivers/gpu/drm/panthor/panthor_devfreq.c

+26 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/panthor/panthor_devfreq.h

+2 −0
Original line number Diff line number Diff line
@@ -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__ */

drivers/gpu/drm/panthor/panthor_device.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/panthor/panthor_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -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)