msm/drm: A6xx DCVS series
Subsystems (4)
v2 cover msm/drm: A6xx DCVS series
This patch series starts off with a few bug fixes in devfreq code, followed by refactoring the devfreq code needed for supporting different chipsets, and ends with adding devfreq support for A6xx.
Sharat Masetty (5):
drm/msm: suspend devfreq on init
drm/msm: unregister devfreq upon clean up
drm/msm/A6xx: Add gmu_read64() register read op
drm/msm: re-factor devfreq code
drm/msm/A6xx: Add devfreq support for A6xx
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 16 ++++++++--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 39 +++++++++++++++++++++++--- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 12 ++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 27 ++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 ++ drivers/gpu/drm/msm/msm_gpu.c | 53 +++++++++++++++++++++-------------- drivers/gpu/drm/msm/msm_gpu.h | 5 +++- 7 files changed, 124 insertions(+), 30 deletions(-)
--
1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/5 drm/msm: suspend devfreq on init
Devfreq turns on and starts recommending power level as soon as it is initialized. The GPU is still not powered on by the time the devfreq init happens and this leads to problems on GPU's where register access is needed to get/set power levels. So we start suspended and only restart devfreq when GPU is powered on.
--- drivers/gpu/drm/msm/msm_gpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/msm/msm_gpu.c +2 -0
@@ -104,6 +104,8 @@ static void msm_devfreq_init(struct msm_gpu *gpu)dev_err (&gpu->pdev->dev,"Couldn't initialize GPU devfreq\n" ); gpu->devfreq.devfreq =NULL ; } + +devfreq_suspend_device (gpu->devfreq.devfreq); }static int enable_pwrrail (struct msm_gpu *gpu)
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 1535354240-24805-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v2 2/5 drm/msm: unregister devfreq upon clean up
Call the devfreq_remove_device() API to remove the GPU devfreq instance during GPU driver cleanup.
--- drivers/gpu/drm/msm/msm_gpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/msm/msm_gpu.c +2 -0
@@ -970,6 +970,8 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)WARN_ON (!list_empty (&gpu->active_list)); +devm_devfreq_remove_device (&gpu->pdev->dev, gpu->devfreq.devfreq); +for (i =0 ; i <ARRAY_SIZE (gpu->rb); i++) {msm_ringbuffer_destroy (gpu->rb[i]); gpu->rb[i] =NULL ;
Signature · 6 lines
1.9.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1535354240-24805-3-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Re: [PATCH v2 2/5] drm/msm: unregister devfreq upon clean up
Quoted 13 lines · Sharat Masetty
Call the
devfreq_remove_device()API to remove the GPU devfreq instance during GPU driver cleanup.Signed-off-by Sharat Masetty <[email protected]>--- drivers/gpu/drm/msm/msm_gpu.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/msm/msm_gpu.c +0
-0
drivers/gpu/drm/msm/msm_gpu.c void msm_gpu_cleanup(struct msm_gpu *gpu) · line 974
Quoted 5 lines
drivers/gpu/drm/msm/msm_gpu.c +2
-0@@ -970,6 +970,8 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)WARN_ON (!list_empty (&gpu->active_list)); +devm_devfreq_remove_device (&gpu->pdev->dev, gpu->devfreq.devfreq); +
Sorry, I don't think I made myself clear. We should use devm_devfreq_add_device during initialization so that we don't need to do a devfreq_remove_device during cleanup. This will still be a one line patch but in a different location.
Jordan
Quoted 6 lines
drivers/gpu/drm/msm/msm_gpu.c +0
-0for (i =0 ; i <ARRAY_SIZE (gpu->rb); i++) {msm_ringbuffer_destroy (gpu->rb[i]); gpu->rb[i] =NULL ;Signature · 1 line
1.9.1
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v2 3/5 drm/msm/A6xx: Add gmu_read64() register read op
In reply to a message not in the archiveAdd a simple function to read 64 registers in the GMU domain
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +10 -0
@@ -106,6 +106,16 @@ static inline void gmu_rmw(struct a6xx_gmu *gmu, u32 reg, u32 mask, u32 or)gmu_write (gmu, reg, val | or); } +static inline u64 gmu_read64 (struct a6xx_gmu *gmu,u32 lo,u32 hi) +{ +u64 val; + + val = (u64 )msm_readl (gmu->mmio + (lo <<2 )); + val |= ((u64 )msm_readl (gmu->mmio + (hi <<2 )) <<32 ); + +return val; +} +#define gmu_poll_timeout (gmu, addr, val, cond, interval, timeout) \ readl_poll_timeout((gmu)->mmio + ((addr) << 2), val, cond, \ interval, timeout)
Signature · 6 lines
1.9.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v2 4/5 drm/msm: re-factor devfreq code
In reply to a message not in the archiveThe 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.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 16 +++++++++--- drivers/gpu/drm/msm/msm_gpu.c | 49 ++++++++++++++++++++--------------- drivers/gpu/drm/msm/msm_gpu.h | 5 +++- 3 files changed, 44 insertions(+), 26 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +12 -4
@@ -1369,12 +1369,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 , -REG_A5XX_RBBM_PERFCTR_RBBM_0_HI ); +u64 busy_cycles; +unsigned long busy_time; -return 0 ; + busy_cycles =gpu_read64 (gpu,REG_A5XX_RBBM_PERFCTR_RBBM_0_LO , +REG_A5XX_RBBM_PERFCTR_RBBM_0_HI ); + + 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 +28 -21
96 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.h +4 -1
@@ -68,9 +68,11 @@ struct msm_gpu_funcs {void (*show)(struct msm_gpu *gpu,struct msm_gpu_state *state,struct drm_printer *p);#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); +int (*gpu_set_freq)(struct msm_gpu *gpu,unsigned long freq); };struct msm_gpu {
@@ -262,6 +264,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);
Signature · 6 lines
1.9.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [PATCH v2 4/5] drm/msm: re-factor devfreq code
Quoted 51 lines · Sharat Masetty
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 Sharat Masetty <[email protected]>--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 16 +++++++++--- drivers/gpu/drm/msm/msm_gpu.c | 49 ++++++++++++++++++++--------------- drivers/gpu/drm/msm/msm_gpu.h | 5 +++- 3 files changed, 44 insertions(+), 26 deletions(-)drivers/gpu/drm/msm/adreno/a5xx_gpu.c +12
-4@@ -1369,12 +1369,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 , -REG_A5XX_RBBM_PERFCTR_RBBM_0_HI ); +u64 busy_cycles; +unsigned long busy_time; -return 0 ; + busy_cycles =gpu_read64 (gpu,REG_A5XX_RBBM_PERFCTR_RBBM_0_LO , +REG_A5XX_RBBM_PERFCTR_RBBM_0_HI ); + + 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 +0
-0@@ -36,12 +36,16 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,struct msm_gpu *gpu =platform_get_drvdata (to_platform_device (dev));
drivers/gpu/drm/msm/msm_gpu.c static int msm_devfreq_target(struct device *dev, unsigned long *freq, · line 44
Quoted 10 lines
drivers/gpu/drm/msm/msm_gpu.c +5
-2struct dev_pm_opp *opp; - opp =dev_pm_opp_find_freq_ceil (dev, freq); + opp =devfreq_recommended_opp (dev, freq, flags); +if (IS_ERR (opp)) +return PTR_ERR (opp); -if (!IS_ERR (opp)) { +if (gpu->funcs->gpu_set_freq) + gpu->funcs->gpu_set_freq (gpu, (u64)*freq);
Depending on how the interconnect patches end up looking it might make more sense for us to send the OPP itself to gpu_set_freq() but we'll put a pin in that until we know more.
Jordan
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 5/5 drm/msm/A6xx: Add devfreq support for A6xx
In reply to a message not in the archiveImplement routines to estimate GPU busy time and fetching the current frequency for the polling interval. This is required by the devfreq framework which recommends a frequency change if needed. The driver code then tries to set this new frequency on the GPU by sending an Out Of Band(OOB) request to the GMU.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 39 +++++++++++++++++++++++++++++++---- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 ++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 27 ++++++++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 ++ 4 files changed, 66 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +35 -4
@@ -67,7 +67,7 @@ static bool a6xx_gmu_gx_is_on(struct a6xx_gmu *gmu) A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_CLK_OFF)); } -static int a6xx_gmu_set_freq (struct a6xx_gmu *gmu,int index) +static int __a6xx_gmu_set_freq (struct a6xx_gmu *gmu,int index) {gmu_write (gmu,REG_A6XX_GMU_DCVS_ACK_OPTION ,0 );
@@ -84,7 +84,38 @@ static int a6xx_gmu_set_freq(struct a6xx_gmu *gmu, int index)a6xx_gmu_set_oob (gmu,GMU_OOB_DCVS_SET );a6xx_gmu_clear_oob (gmu,GMU_OOB_DCVS_SET ); -return gmu_read (gmu,REG_A6XX_GMU_DCVS_RETURN ); +if (gmu_read (gmu,REG_A6XX_GMU_DCVS_RETURN ) !=0 ) +return -EINVAL ; + + gmu->freq = gmu->gpu_freqs[index]; + +return 0 ; +} + +int a6xx_gmu_set_freq (struct msm_gpu *gpu,unsigned long freq) +{ +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +struct a6xx_gmu *gmu = &a6xx_gpu->gmu; +u32 perf_index =0 ; + +if (freq == gmu->freq) +return 0 ; + +for (perf_index =0 ; perf_index < gmu->nr_gpu_freqs -1 ; perf_index++) +if (freq == gmu->gpu_freqs[perf_index]) +break ; + +return __a6xx_gmu_set_freq (gmu, perf_index); +} + +unsigned long a6xx_gmu_get_freq (struct msm_gpu *gpu) +{ +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +struct a6xx_gmu *gmu = &a6xx_gpu->gmu; + +return gmu->freq; }static bool a6xx_gmu_check_idle_level (struct a6xx_gmu *gmu)
@@ -630,7 +661,7 @@ int a6xx_gmu_reset(struct a6xx_gpu *a6xx_gpu) ret =a6xx_hfi_start (gmu,GMU_COLD_BOOT );/* Set the GPU back to the highest power frequency */ -a6xx_gmu_set_freq (gmu, gmu->nr_gpu_freqs -1 ); +__a6xx_gmu_set_freq (gmu, gmu->nr_gpu_freqs -1 ); out:if (ret)
@@ -671,7 +702,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) ret =a6xx_hfi_start (gmu, status);/* Set the GPU to the highest power frequency */ -a6xx_gmu_set_freq (gmu, gmu->nr_gpu_freqs -1 ); +__a6xx_gmu_set_freq (gmu, gmu->nr_gpu_freqs -1 ); out:/* Make sure to turn off the boot OOB request on error */
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +2 -0
@@ -77,6 +77,8 @@ struct a6xx_gmu {unsigned long gmu_freqs[4 ];u32 cx_arc_votes[4 ]; +unsigned long freq; +struct a6xx_hfi_queue queues[2 ];struct tasklet_struct hfi_tasklet;
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +27 -0
@@ -7,6 +7,8 @@#include "a6xx_gpu.h" #include "a6xx_gmu.xml.h" +#include <linux/devfreq.h> +static inline bool _a6xx_check_idle (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);
@@ -682,6 +684,8 @@ static int a6xx_pm_resume(struct msm_gpu *gpu) gpu->needs_hw_init = true; +msm_gpu_resume_devfreq (gpu); +return ret; }
@@ -690,6 +694,8 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu)struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +devfreq_suspend_device (gpu->devfreq.devfreq); +/* * Make sure the GMU is idle before continuing (because some transitions * may use VBIF
@@ -753,6 +759,24 @@ static void a6xx_destroy(struct msm_gpu *gpu)kfree (a6xx_gpu); } +static unsigned long a6xx_gpu_busy (struct msm_gpu *gpu) +{ +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +u64 busy_cycles; +unsigned long busy_time; + + busy_cycles =gmu_read64 (&a6xx_gpu->gmu, +REG_A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_0_L , +REG_A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_0_H ); + + busy_time = ((busy_cycles - gpu->devfreq.busy_cycles) *10 ) /192 ; + + gpu->devfreq.busy_cycles = busy_cycles; + +return busy_time; +} +static const struct adreno_gpu_funcs funcs = { .base = { .get_param = adreno_get_param,
@@ -768,6 +792,9 @@ static void a6xx_destroy(struct msm_gpu *gpu)#if defined(CONFIG_DEBUG_FS ) || defined(CONFIG_DEV_COREDUMP ) .show = a6xx_show, #endif + .gpu_busy = a6xx_gpu_busy, + .gpu_get_freq = a6xx_gmu_get_freq, + .gpu_set_freq = a6xx_gmu_set_freq, }, .get_timestamp = a6xx_get_timestamp, };
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +2 -0
@@ -56,5 +56,7 @@ struct a6xx_gpu {int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node,struct platform_device *gpu_pdev);void a6xx_gmu_remove (struct a6xx_gpu *a6xx_gpu); +int a6xx_gmu_set_freq (struct msm_gpu *gpu,unsigned long freq); +unsigned long a6xx_gmu_get_freq (struct msm_gpu *gpu);#endif /* __A6XX_GPU_H__ */
Signature · 6 lines
1.9.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 1535354240-24805-6-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Re: [PATCH v2 5/5] drm/msm/A6xx: Add devfreq support for A6xx
Quoted 29 lines · Sharat Masetty
Implement routines to estimate GPU busy time and fetching the current frequency for the polling interval. This is required by the devfreq framework which recommends a frequency change if needed. The driver code then tries to set this new frequency on the GPU by sending an Out Of Band(OOB) request to the GMU.
Signed-off-by Sharat Masetty <[email protected]>--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 39 +++++++++++++++++++++++++++++++---- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 ++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 27 ++++++++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 ++ 4 files changed, 66 insertions(+), 4 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +1
-1@@ -67,7 +67,7 @@ static bool a6xx_gmu_gx_is_on(struct a6xx_gmu *gmu) A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_CLK_OFF)); } -static int a6xx_gmu_set_freq (struct a6xx_gmu *gmu,int index) +static int __a6xx_gmu_set_freq (struct a6xx_gmu *gmu,int index) {gmu_write (gmu,REG_A6XX_GMU_DCVS_ACK_OPTION ,0 );@@ -84,7 +84,38 @@ static int a6xx_gmu_set_freq(struct a6xx_gmu *gmu, int index)a6xx_gmu_set_oob (gmu,GMU_OOB_DCVS_SET );
drivers/gpu/drm/msm/adreno/a6xx_gmu.c static int a6xx_gmu_set_freq(struct a6xx_gmu *gmu, int index) · line 93
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +7
-1a6xx_gmu_clear_oob (gmu,GMU_OOB_DCVS_SET ); -return gmu_read (gmu,REG_A6XX_GMU_DCVS_RETURN ); +if (gmu_read (gmu,REG_A6XX_GMU_DCVS_RETURN ) !=0 ) +return -EINVAL ; + + gmu->freq = gmu->gpu_freqs[index]; + +return 0 ; +}
While I was working on the interconnect patches it occurred to me that the upper levels doesn't really care what the value of A6XX_GMU_DCVS_RETURN is so we might want to just print an error message and return nothing. If the DCVS set didn't work we might be headed for disaster on the GMU side but its more likely that we'll just continue along at the current frequency for the next cycle so it isn't terribly harmful.
Jordan
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno