Commit de0a3d09 authored by Sharat Masetty's avatar Sharat Masetty Committed by Rob Clark
Browse files

drm/msm: re-factor devfreq code 



The devfreq framework requires the drivers to provide busy time estimations.
The GPU driver relies on the hardware performance counteres for the busy time
estimations, but different hardware revisions have counters which can be
sourced from different clocks. So the busy time estimation will be target
dependent.  Additionally on targets where the clocks are completely controlled
by the on chip microcontroller, fetching and setting the current GPU frequency
will be different. This patch aims to embrace these differences by re-factoring
the devfreq code a bit.

Signed-off-by: default avatarSharat Masetty <smasetty@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent c28aa203

drivers/gpu/drm/msm/adreno/a5xx_gpu.c

+12 −4
Original line number Diff line number Diff line
@@ -1436,12 +1436,20 @@ static struct msm_ringbuffer *a5xx_active_ring(struct msm_gpu *gpu) 
	return a5xx_gpu->cur_ring;

}



static int a5xx_gpu_busy(struct msm_gpu *gpu, uint64_t *value)

static unsigned long a5xx_gpu_busy(struct msm_gpu *gpu)

{

	*value = gpu_read64(gpu, REG_A5XX_RBBM_PERFCTR_RBBM_0_LO,

	u64 busy_cycles;

	unsigned long busy_time;



	busy_cycles = gpu_read64(gpu, REG_A5XX_RBBM_PERFCTR_RBBM_0_LO,

			REG_A5XX_RBBM_PERFCTR_RBBM_0_HI);



	return 0;

	busy_time = (busy_cycles - gpu->devfreq.busy_cycles) /

		(clk_get_rate(gpu->core_clk) / 1000000);



	gpu->devfreq.busy_cycles = busy_cycles;



	return busy_time;

}



static const struct adreno_gpu_funcs funcs = {

drivers/gpu/drm/msm/msm_gpu.c

+25 −18
Original line number Diff line number Diff line
@@ -41,7 +41,11 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq, 
	if (IS_ERR(opp))

		return PTR_ERR(opp);



	if (gpu->funcs->gpu_set_freq)

		gpu->funcs->gpu_set_freq(gpu, (u64)*freq);

	else

		clk_set_rate(gpu->core_clk, *freq);



	dev_pm_opp_put(opp);



	return 0;
@@ -51,16 +55,14 @@ static int msm_devfreq_get_dev_status(struct device *dev, 
		struct devfreq_dev_status *status)

{

	struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev));

	u64 cycles;

	u32 freq = ((u32) status->current_frequency) / 1000000;

	ktime_t time;



	status->current_frequency = (unsigned long) clk_get_rate(gpu->core_clk);

	gpu->funcs->gpu_busy(gpu, &cycles);



	status->busy_time = ((u32) (cycles - gpu->devfreq.busy_cycles)) / freq;

	if (gpu->funcs->gpu_get_freq)

		status->current_frequency = gpu->funcs->gpu_get_freq(gpu);

	else

		status->current_frequency = clk_get_rate(gpu->core_clk);



	gpu->devfreq.busy_cycles = cycles;

	status->busy_time = gpu->funcs->gpu_busy(gpu);



	time = ktime_get();

	status->total_time = ktime_us_delta(time, gpu->devfreq.time);
@@ -73,7 +75,10 @@ static int msm_devfreq_get_cur_freq(struct device *dev, unsigned long *freq) 
{

	struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev));



	*freq = (unsigned long) clk_get_rate(gpu->core_clk);

	if (gpu->funcs->gpu_get_freq)

		*freq = gpu->funcs->gpu_get_freq(gpu);

	else

		*freq = clk_get_rate(gpu->core_clk);



	return 0;

}
@@ -88,7 +93,7 @@ static struct devfreq_dev_profile msm_devfreq_profile = { 
static void msm_devfreq_init(struct msm_gpu *gpu)

{

	/* We need target support to do devfreq */

	if (!gpu->funcs->gpu_busy || !gpu->core_clk)

	if (!gpu->funcs->gpu_busy)

		return;



	msm_devfreq_profile.initial_freq = gpu->fast_rate;
@@ -186,6 +191,14 @@ static int disable_axi(struct msm_gpu *gpu) 
	return 0;

}



void msm_gpu_resume_devfreq(struct msm_gpu *gpu)

{

	gpu->devfreq.busy_cycles = 0;

	gpu->devfreq.time = ktime_get();



	devfreq_resume_device(gpu->devfreq.devfreq);

}



int msm_gpu_pm_resume(struct msm_gpu *gpu)

{

	int ret;
@@ -204,12 +217,7 @@ int msm_gpu_pm_resume(struct msm_gpu *gpu) 
	if (ret)

		return ret;



	if (gpu->devfreq.devfreq) {

		gpu->devfreq.busy_cycles = 0;

		gpu->devfreq.time = ktime_get();



		devfreq_resume_device(gpu->devfreq.devfreq);

	}

	msm_gpu_resume_devfreq(gpu);



	gpu->needs_hw_init = true;
@@ -222,7 +230,6 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu) 


	DBG("%s", gpu->name);



	if (gpu->devfreq.devfreq)

	devfreq_suspend_device(gpu->devfreq.devfreq);



	ret = disable_axi(gpu);

drivers/gpu/drm/msm/msm_gpu.h

+4 −1
Original line number Diff line number Diff line
@@ -70,9 +70,11 @@ struct msm_gpu_funcs { 
	/* for generation specific debugfs: */

	int (*debugfs_init)(struct msm_gpu *gpu, struct drm_minor *minor);

#endif

	int (*gpu_busy)(struct msm_gpu *gpu, uint64_t *value);

	unsigned long (*gpu_busy)(struct msm_gpu *gpu);

	struct msm_gpu_state *(*gpu_state_get)(struct msm_gpu *gpu);

	int (*gpu_state_put)(struct msm_gpu_state *state);

	unsigned long (*gpu_get_freq)(struct msm_gpu *gpu);

	void (*gpu_set_freq)(struct msm_gpu *gpu, unsigned long freq);

};



struct msm_gpu {
@@ -264,6 +266,7 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 lo, u32 hi, u64 val) 


int msm_gpu_pm_suspend(struct msm_gpu *gpu);

int msm_gpu_pm_resume(struct msm_gpu *gpu);

void msm_gpu_resume_devfreq(struct msm_gpu *gpu);



int msm_gpu_hw_init(struct msm_gpu *gpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE