drm/komeda: fix 32-bit komeda_crtc_update_clock_ratio
Subsystems (4)
PATCH 1/1 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.
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2 -3
@@ -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); }/**
Signature · 1 line
2.20.0
Quoted 4 lines · Arnd Bergmann
clang points out a bug in the clock calculation on 32-bit, that leads to the
clock_ratioalways being zero:
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c:31:36: error: shift count >= width of type [-Werror,-Wshift-count-overflow]
Quoted 8 lines
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 ofdiv_u64()to account for pxlclk being a 64-bit integer.Fixes a962091227ed ("drm/komeda: Add engine clock requirement check for the downscaling")Signed-off-by Arnd Bergmann <[email protected]>
Thanks for the patch, I will pull it into the komeda tree.
Best regards,
Liviu
Quoted 24 lines
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-3@@ -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); }/** Signature · 1 line
2.20.0
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-develQuoted 35 lines · Arnd Bergmann
clang points out a bug in the clock calculation on 32-bit, that leads to the
clock_ratioalways 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 ofdiv_u64()to account for pxlclk being a 64-bit integer.Fixes a962091227ed ("drm/komeda: Add engine clock requirement check for the downscaling")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2
-3@@ -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); }/** Signature · 1 line
2.20.0
Hi Arnd:
Thank you for the patch.