Skip to contentSkip to conversation

drm/amd/display: Fix 32-bit divide error in wait_for_alt_mode

PATCH Applied Nathan Chancellor 4 participants 4 messages Aug 20, 2019 – Aug 22, 2019

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

PATCH 1/1 drm/amd/display: Fix 32-bit divide error in wait_for_alt_mode

When building arm32 allyesconfig:

ld.lld: error: undefined symbol: __aeabi_uldivmod

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

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")
---
 drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +2 -2
index f2d78d7b089e..8634923b4444 100644
@@ -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;
 }
 
Signature · 1 line
2.23.0
Acked-by on v1 1/1
#1 lore raw
Quoted 8 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 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

Quoted 6 lines

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")

Thanks.

Quoted 27 lines
---
 drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +2 -2
index f2d78d7b089e..8634923b4444 100644
@@ -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;
 }
 
Signature · 1 line
~Randy
Reviewed-by on v1 1/1
#2 lore raw
In reply to Nathan Chancellor
Quoted 8 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 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

Quoted 6 lines

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")

Harry

Quoted 19 lines
---
 drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
index f2d78d7b089e..8634923b4444 100644
@@ -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;
 		}
 

drivers/gpu/drm/amd/display/dc/core/dc_link.c bool wait_for_alt_mode(struct dc_link *link) · line 736

Quoted 8 lines
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -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;
 }
 

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

Applied
#3 lore raw

Applied. thanks!

Alex

Quoted 52 lines · Harry Wentland
Quoted 8 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 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

Quoted 6 lines

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")

Harry

Quoted 19 lines
---
 drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
index f2d78d7b089e..8634923b4444 100644
@@ -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;
              }
 

drivers/gpu/drm/amd/display/dc/core/dc_link.c bool wait_for_alt_mode(struct dc_link *link) · line 736

Quoted 8 lines
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -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;
 }
 

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