gpu: nvgpu: Use nvgpu_cond in semaphore wq

Change semaphore wait queue to use nvgpu_cond instead of Linux wait
queue.

JIRA NVGPU-14

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

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
index 87fa9fdb..c479f359 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
@@ -17,8 +17,6 @@
 #ifndef _GK20A_FENCE_H_
 #define _GK20A_FENCE_H_
 
-#include <linux/wait.h>
-
 #include <nvgpu/kref.h>
 
 struct platform_device;
@@ -42,7 +40,7 @@ struct gk20a_fence {
 
         /* Valid for fences created from semaphores: */
         struct nvgpu_semaphore *semaphore;
-        wait_queue_head_t *semaphore_wq;
+        struct nvgpu_cond *semaphore_wq;
 
         /* Valid for fences created from syncpoints: */
         struct platform_device *host1x_pdev;
@@ -59,7 +57,7 @@ int gk20a_fence_from_semaphore(
                 struct gk20a_fence *fence_out,
                 struct sync_timeline *timeline,
                 struct nvgpu_semaphore *semaphore,
-                wait_queue_head_t *semaphore_wq,
+                struct nvgpu_cond *semaphore_wq,
                 bool wfi, bool need_sync_fence);
 
 int gk20a_fence_from_syncpt(