diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2019-06-17 14:51:04 +0200 |
|---|---|---|
| committer |   Liviu Dudau <Liviu.Dudau@arm.com> | 2019-06-21 10:46:40 +0100 |
| commit | 0b044a999e86ed1aa8791f8bd11a6d7083b33438 (patch) | |
| tree | 157dc8fc775f90c09d9fc9baf8e1fbb4afab623f /drivers | |
| parent | drm/komeda: Correct printk format specifier for "size_t" (diff) | |
| download | linux-dev-0b044a999e86ed1aa8791f8bd11a6d7083b33438.tar.xz linux-dev-0b044a999e86ed1aa8791f8bd11a6d7083b33438.zip | |
drm/komeda: fix 32-bit komeda_crtc_update_clock_ratio
clang points out a bug in the clock calculation on 32-bit, that leads
to the clock_ratio always being zero:
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c:31:36: error: shift count >= width of type [-Werror,-Wshift-count-overflow]
aclk = komeda_calc_aclk(kcrtc_st) << 32;
Move the shift into the division to make it apply on a 64-bit
variable. Also use the more expensive div64_u64() instead of div_u64()
to account for pxlclk being a 64-bit integer.
Fixes: 1f7f9ab7900e ("drm/komeda: Add engine clock requirement check for the downscaling")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index cafb4457e187..3f222f464eb2 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -28,10 +28,9 @@ static void komeda_crtc_update_clock_ratio(struct komeda_crtc_state *kcrtc_st) } pxlclk = kcrtc_st->base.adjusted_mode.clock * 1000; - aclk = komeda_calc_aclk(kcrtc_st) << 32; + aclk = komeda_calc_aclk(kcrtc_st); - do_div(aclk, pxlclk); - kcrtc_st->clock_ratio = aclk; + kcrtc_st->clock_ratio = div64_u64(aclk << 32, pxlclk); } /** |