Merge tag 'drm-msm-fixes-2018-10-09' of git://people.freedesktop.org/~robclark/linux into drm-next

Fix 32-bit arm build.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGt7s20e4aJmnOFM-uZHfYSsicy0E=ssse1D7LTXX4jnWQ@mail.gmail.com

2 files changed, 9 insertions, 6 deletions

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index eabe9252ae1e..48b5304f460c 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -1443,8 +1443,8 @@ static unsigned long a5xx_gpu_busy(struct msm_gpu *gpu)
         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);
-        do_div(busy_time, (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;
 
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index cdc3d59a659d..631257c297fd 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -761,18 +761,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 = {