Mesa (master): freedreno/drm: Don't miscalculate timeout

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c5334d2943edc34052269cdb5c1052f6eb65335c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5334d2943edc34052269cdb5c1052f6eb65335c

Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Jan 22 11:43:11 2020 +0100

freedreno/drm: Don't miscalculate timeout

The current code overflows (s * 1000000000) for s >= 5 but that is
e.g. used in msm_bo_cpu_prep.

Signed-off-by: Guido Günther <agx at sigxcpu.org>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3514>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3514>

---

 src/freedreno/drm/msm_priv.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/freedreno/drm/msm_priv.h b/src/freedreno/drm/msm_priv.h
index 172e9870fe5..37adb13624c 100644
--- a/src/freedreno/drm/msm_priv.h
+++ b/src/freedreno/drm/msm_priv.h
@@ -108,10 +108,9 @@ msm_dump_submit(struct drm_msm_gem_submit *req)
 static inline void get_abs_timeout(struct drm_msm_timespec *tv, uint64_t ns)
 {
 	struct timespec t;
-	uint32_t s = ns / 1000000000;
 	clock_gettime(CLOCK_MONOTONIC, &t);
-	tv->tv_sec = t.tv_sec + s;
-	tv->tv_nsec = t.tv_nsec + ns - (s * 1000000000);
+	tv->tv_sec = t.tv_sec + ns / 1000000000;
+	tv->tv_nsec = t.tv_nsec + ns % 1000000000;
 }
 
 /*