drm/msm: adreno: Fix improper u64 division
Subsystems (4)
PATCH v2 1/1 drm/msm: adreno: Fix improper u64 division
From: Sean Paul <[email protected]>
This patch uses the proper do_div() macro to perform u64 division and guards against overflow if the result is too large for the unsigned long return type
Changes in v2:
- Added a6xx to the patch
- Removed parens from denominator in a5xx
Fixes de0a3d094de0 drm/msm: re-factor devfreq code
Cc Sharat Masetty <[email protected]>
Signed-off-by Sean Paul <[email protected]>
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 12 +++++++----- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 +++++++---- 2 files changed, 14 insertions(+), 9 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +7 -5
@@ -1438,18 +1438,20 @@ static struct msm_ringbuffer *a5xx_active_ring(struct msm_gpu *gpu)static unsigned long a5xx_gpu_busy (struct msm_gpu *gpu) { -u64 busy_cycles; -unsigned long busy_time; +u64 busy_cycles, busy_time; 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 ); + busy_time = (busy_cycles - gpu->devfreq.busy_cycles); +do_div (busy_time,clk_get_rate (gpu->core_clk) /1000000 ); gpu->devfreq.busy_cycles = busy_cycles; -return busy_time; +if (WARN_ON (busy_time > ~0LU )) +return ~0LU ; + +return (unsigned long )busy_time; }static const struct adreno_gpu_funcs funcs = {
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +7 -4
@@ -763,18 +763,21 @@ 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; +u64 busy_cycles, 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 ; + busy_time = (busy_cycles - gpu->devfreq.busy_cycles) *10 ; +do_div (busy_time,192 ); gpu->devfreq.busy_cycles = busy_cycles; -return busy_time; +if (WARN_ON (busy_time > ~0LU )) +return ~0LU ; + +return (unsigned long )busy_time; }static const struct adreno_gpu_funcs funcs = {
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno