Skip to contentSkip to conversation

drm/amd/display: Fix 64-bit division error on 32-bit platforms in mod_freesync_build_vrr_params

PATCH Applied Nathan Chancellor 2 participants 2 messages Mar 30, 2020 – Mar 31, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: Fix 64-bit division error on 32-bit platforms in mod_freesync_build_vrr_params

When building arm32 allyesconfig,

ld.lld: error: undefined symbol: __aeabi_uldivmod

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

referenced by freesync.c
gpu/drm/amd/display/modules/freesync/freesync.o:(mod_freesync_build_vrr_params) in archive drivers/built-in.a
did you mean: __aeabi_uidivmod
defined in: arch/arm/lib/lib.a(lib1funcs.o)

Use div_u64 in the two locations that do 64-bit divisior, which both have a u64 dividend and u32 divisor.

Fixes 349a370781de ("drm/amd/display: LFC not working on 2.0x range monitors")
---
 drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +2 -2
index 8911f01671aa..c33454a9e0b4 100644
@@ -761,10 +761,10 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync,
 
 	// If a monitor reports exactly max refresh of 2x of min, enforce it on nominal
 	rounded_nominal_in_uhz =
-			((nominal_field_rate_in_uhz + 50000) / 100000) * 100000;
+			div_u64(nominal_field_rate_in_uhz + 50000, 100000) * 100000;
 	if (in_config->max_refresh_in_uhz == (2 * in_config->min_refresh_in_uhz) &&
 		in_config->max_refresh_in_uhz == rounded_nominal_in_uhz)
-		min_refresh_in_uhz = nominal_field_rate_in_uhz / 2;
+		min_refresh_in_uhz = div_u64(nominal_field_rate_in_uhz, 2);
 
 	if (!vrr_settings_require_update(core_freesync,
 			in_config, (unsigned int)min_refresh_in_uhz, (unsigned int)max_refresh_in_uhz,
Signature · 1 line
2.26.0
Applied
#1 lore raw
Quoted 9 lines · Nathan Chancellor

When building arm32 allyesconfig,

ld.lld: error: undefined symbol: __aeabi_uldivmod

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

referenced by freesync.c
gpu/drm/amd/display/modules/freesync/freesync.o:(mod_freesync_build_vrr_params) in archive drivers/built-in.a
did you mean: __aeabi_uidivmod
defined in: arch/arm/lib/lib.a(lib1funcs.o)

Quoted 5 lines

Use div_u64 in the two locations that do 64-bit divisior, which both have a u64 dividend and u32 divisor.

Fixes 349a370781de ("drm/amd/display: LFC not working on 2.0x range monitors")

Applied. Thanks!

Alex

Quoted 24 lines
---
 drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +2 -3
index 8911f01671aa..c33454a9e0b4 100644
@@ -761,10 +761,10 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync,
 
        // If a monitor reports exactly max refresh of 2x of min, enforce it on nominal
        rounded_nominal_in_uhz =
-                       ((nominal_field_rate_in_uhz + 50000) / 100000) * 100000;
+                       div_u64(nominal_field_rate_in_uhz + 50000, 100000) * 100000;
        if (in_config->max_refresh_in_uhz == (2 * in_config->min_refresh_in_uhz) &&
                in_config->max_refresh_in_uhz == rounded_nominal_in_uhz)
-               min_refresh_in_uhz = nominal_field_rate_in_uhz / 2;
+               min_refresh_in_uhz = div_u64(nominal_field_rate_in_uhz, 2);
 
        if (!vrr_settings_require_update(core_freesync,
                        in_config, (unsigned int)min_refresh_in_uhz, (unsigned int)max_refresh_in_uhz,
--

2.26.0

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel