From: Nathan Chancellor Date: Tue, 20 Aug 2019 23:57:13 +0000 (-0700) Subject: drm/amd/display: Fix 32-bit divide error in wait_for_alt_mode X-Git-Tag: Ubuntu-5.13.0-19.19~7656^2~7^2~100 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b859c579cdff00a6458d69442a19f85a403fd71b;p=mirror_ubuntu-jammy-kernel.git drm/amd/display: Fix 32-bit divide error in wait_for_alt_mode When building arm32 allyesconfig: ld.lld: error: undefined symbol: __aeabi_uldivmod >>> referenced by dc_link.c >>> gpu/drm/amd/display/dc/core/dc_link.o:(wait_for_alt_mode) in archive drivers/built-in.a >>> referenced by dc_link.c >>> gpu/drm/amd/display/dc/core/dc_link.o:(wait_for_alt_mode) in archive drivers/built-in.a time_taken_in_ns is of type unsigned long long so we need to use div_u64 to avoid this error. Fixes: b5b1f4554904 ("drm/amd/display: Enable type C hotplug") Reported-by: Randy Dunlap Acked-by: Randy Dunlap # build-tested Reviewed-by: Harry Wentland Signed-off-by: Nathan Chancellor Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index f2d78d7b089e..8634923b4444 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -721,7 +721,7 @@ bool wait_for_alt_mode(struct dc_link *link) time_taken_in_ns = dm_get_elapse_time_in_ns( link->ctx, finish_timestamp, enter_timestamp); DC_LOG_WARNING("Alt mode entered finished after %llu ms\n", - time_taken_in_ns / 1000000); + div_u64(time_taken_in_ns, 1000000)); return true; } @@ -730,7 +730,7 @@ bool wait_for_alt_mode(struct dc_link *link) time_taken_in_ns = dm_get_elapse_time_in_ns(link->ctx, finish_timestamp, enter_timestamp); DC_LOG_WARNING("Alt mode has timed out after %llu ms\n", - time_taken_in_ns / 1000000); + div_u64(time_taken_in_ns, 1000000)); return false; }