diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c index 87c4f6be..3964c37d 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c | |||
@@ -208,8 +208,8 @@ static int nvgpu_semaphore_fence_wait(struct gk20a_fence *f, long timeout) | |||
208 | if (!nvgpu_semaphore_is_acquired(f->semaphore)) | 208 | if (!nvgpu_semaphore_is_acquired(f->semaphore)) |
209 | return 0; | 209 | return 0; |
210 | 210 | ||
211 | remain = wait_event_interruptible_timeout( | 211 | remain = NVGPU_COND_WAIT_INTERRUPTIBLE( |
212 | *f->semaphore_wq, | 212 | f->semaphore_wq, |
213 | !nvgpu_semaphore_is_acquired(f->semaphore), | 213 | !nvgpu_semaphore_is_acquired(f->semaphore), |
214 | timeout); | 214 | timeout); |
215 | if (remain == 0 && nvgpu_semaphore_is_acquired(f->semaphore)) | 215 | if (remain == 0 && nvgpu_semaphore_is_acquired(f->semaphore)) |
@@ -235,7 +235,7 @@ int gk20a_fence_from_semaphore( | |||
235 | struct gk20a_fence *fence_out, | 235 | struct gk20a_fence *fence_out, |
236 | struct sync_timeline *timeline, | 236 | struct sync_timeline *timeline, |
237 | struct nvgpu_semaphore *semaphore, | 237 | struct nvgpu_semaphore *semaphore, |
238 | wait_queue_head_t *semaphore_wq, | 238 | struct nvgpu_cond *semaphore_wq, |
239 | bool wfi, bool need_sync_fence) | 239 | bool wfi, bool need_sync_fence) |
240 | { | 240 | { |
241 | struct gk20a_fence *f = fence_out; | 241 | struct gk20a_fence *f = fence_out; |