OSDN Git Service

amdgpu: fix overflow for timeout calculation
authorJammy Zhou <Jammy.Zhou@amd.com>
Tue, 17 Nov 2015 09:14:35 +0000 (17:14 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 21 Nov 2015 00:21:48 +0000 (19:21 -0500)
Set the timeout to AMDGPU_TIMEOUT_INFINITE when overflow happens

Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
amdgpu/amdgpu_cs.c

index 4da9821..aa594c4 100644 (file)
@@ -289,12 +289,16 @@ drm_private uint64_t amdgpu_cs_calculate_timeout(uint64_t timeout)
 
        if (timeout != AMDGPU_TIMEOUT_INFINITE) {
                struct timespec current;
+               uint64_t current_ns;
                r = clock_gettime(CLOCK_MONOTONIC, &current);
                if (r)
                        return r;
 
-               timeout += ((uint64_t)current.tv_sec) * 1000000000ull;
-               timeout += current.tv_nsec;
+               current_ns = ((uint64_t)current.tv_sec) * 1000000000ull;
+               current_ns += current.tv_nsec;
+               timeout += current_ns;
+               if (timeout < current_ns)
+                       timeout = AMDGPU_TIMEOUT_INFINITE;
        }
        return timeout;
 }