gpu: nvgpu: Proper timeout for NVGPU_COND_WAIT

The timeout parameter to NVGPU_COND_WAIT()
was passed directly to wait_event_timeout(), which takes jiffies.
Also allows zero timeout to disable timeout.

The return value of NVGPU_COND_WAIT() was defined in a way specific
to how Linux wait_event_() calls work. Replace that with proper error
reporting and change the callers to check against error codes.

JIRA NVGPU-14

Change-Id: Idbd2c8fbbef7589c3ca4f4c5732852bc71217515
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1484927
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
index 3964c37d..7c5d33c7 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
@@ -203,20 +203,13 @@ void gk20a_init_fence(struct gk20a_fence *f,
 
 static int nvgpu_semaphore_fence_wait(struct gk20a_fence *f, long timeout)
 {
-        long remain;
-
         if (!nvgpu_semaphore_is_acquired(f->semaphore))
                 return 0;
 
-        remain = NVGPU_COND_WAIT_INTERRUPTIBLE(
+        return NVGPU_COND_WAIT_INTERRUPTIBLE(
                 f->semaphore_wq,
                 !nvgpu_semaphore_is_acquired(f->semaphore),
                 timeout);
-        if (remain == 0 && nvgpu_semaphore_is_acquired(f->semaphore))
-                return -ETIMEDOUT;
-        else if (remain < 0)
-                return remain;
-        return 0;
 }
 
 static bool nvgpu_semaphore_fence_is_expired(struct gk20a_fence *f)