6 files changed, 17 insertions, 17 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index 9c0d22d2..4b1cb351 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -126,7 +126,7 @@ struct gk20a_event_id_data {
 
         bool event_posted;
 
-        wait_queue_head_t event_id_wq;
+        struct nvgpu_cond event_id_wq;
         struct nvgpu_mutex lock;
         struct nvgpu_list_node event_id_node;
 };
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
index 9977c5a1..fb33de23 100644
--- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
@@ -53,7 +53,7 @@ struct gk20a_ctxsw_dev {
         struct nvgpu_ctxsw_trace_entry *ents;
         struct nvgpu_ctxsw_trace_filter filter;
         bool write_enabled;
-        wait_queue_head_t readout_wq;
+        struct nvgpu_cond readout_wq;
         size_t size;
         u32 num_ents;
 
@@ -100,8 +100,8 @@ ssize_t gk20a_ctxsw_dev_read(struct file *filp, char __user *buf, size_t size,
                 nvgpu_mutex_release(&dev->write_lock);
                 if (filp->f_flags & O_NONBLOCK)
                         return -EAGAIN;
-                err = wait_event_interruptible(dev->readout_wq,
-                        !ring_is_empty(hdr));
+                err = NVGPU_COND_WAIT_INTERRUPTIBLE(&dev->readout_wq,
+                        !ring_is_empty(hdr), 0);
                 if (err)
                         return err;
                 nvgpu_mutex_acquire(&dev->write_lock);
@@ -436,7 +436,7 @@ unsigned int gk20a_ctxsw_dev_poll(struct file *filp, poll_table *wait)
         gk20a_dbg(gpu_dbg_fn|gpu_dbg_ctxsw, "");
 
         nvgpu_mutex_acquire(&dev->write_lock);
-        poll_wait(filp, &dev->readout_wq, wait);
+        poll_wait(filp, &dev->readout_wq.wq, wait);
         if (!ring_is_empty(hdr))
                 mask |= POLLIN | POLLRDNORM;
         nvgpu_mutex_release(&dev->write_lock);
@@ -503,7 +503,7 @@ static int gk20a_ctxsw_init_devs(struct gk20a *g)
                 dev->g = g;
                 dev->hdr = NULL;
                 dev->write_enabled = false;
-                init_waitqueue_head(&dev->readout_wq);
+                nvgpu_cond_init(&dev->readout_wq);
                 err = nvgpu_mutex_init(&dev->write_lock);
                 if (err)
                         return err;
@@ -683,7 +683,7 @@ void gk20a_ctxsw_trace_wake_up(struct gk20a *g, int vmid)
                 return;
 
         dev = &g->ctxsw_trace->devs[vmid];
-        wake_up_interruptible(&dev->readout_wq);
+        nvgpu_cond_signal_interruptible(&dev->readout_wq);
 }
 
 void gk20a_ctxsw_trace_channel_reset(struct gk20a *g, struct channel_gk20a *ch)
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index c2885807..135cb1e9 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -158,7 +158,7 @@ static int gk20a_dbg_gpu_do_dev_open(struct inode *inode,
         dbg_session->is_pg_disabled = false;
         dbg_session->is_timeout_disabled = false;
 
-        init_waitqueue_head(&dbg_session->dbg_events.wait_queue);
+        nvgpu_cond_init(&dbg_session->dbg_events.wait_queue);
         nvgpu_init_list_node(&dbg_session->ch_list);
         err = nvgpu_mutex_init(&dbg_session->ch_list_lock);
         if (err)
@@ -286,7 +286,7 @@ unsigned int gk20a_dbg_gpu_dev_poll(struct file *filep, poll_table *wait)
 
         gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "");
 
-        poll_wait(filep, &dbg_s->dbg_events.wait_queue, wait);
+        poll_wait(filep, &dbg_s->dbg_events.wait_queue.wq, wait);
 
         gk20a_dbg_session_nvgpu_mutex_acquire(dbg_s);
 
@@ -337,7 +337,7 @@ void gk20a_dbg_gpu_post_events(struct channel_gk20a *ch)
 
                         dbg_s->dbg_events.num_pending_events++;
 
-                        wake_up_interruptible_all(&dbg_s->dbg_events.wait_queue);
+                        nvgpu_cond_broadcast_interruptible(&dbg_s->dbg_events.wait_queue);
                 }
         }
 
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.h b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.h
index 062674fb..1a6de3a8 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.h
@@ -41,7 +41,7 @@ struct channel_gk20a *
 nvgpu_dbg_gpu_get_session_channel(struct dbg_session_gk20a *dbg_s);
 
 struct dbg_gpu_session_events {
-        wait_queue_head_t wait_queue;
+        struct nvgpu_cond wait_queue;
         bool events_enabled;
         int num_pending_events;
 };
diff --git a/drivers/gpu/nvgpu/gk20a/sched_gk20a.c b/drivers/gpu/nvgpu/gk20a/sched_gk20a.c
index d635b43b..a77536af 100644
--- a/drivers/gpu/nvgpu/gk20a/sched_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/sched_gk20a.c
@@ -58,8 +58,8 @@ ssize_t gk20a_sched_dev_read(struct file *filp, char __user *buf,
                 nvgpu_mutex_release(&sched->status_lock);
                 if (filp->f_flags & O_NONBLOCK)
                         return -EAGAIN;
-                err = wait_event_interruptible(sched->readout_wq,
-                        sched->status);
+                err = NVGPU_COND_WAIT_INTERRUPTIBLE(&sched->readout_wq,
+                        sched->status, 0);
                 if (err)
                         return err;
                 nvgpu_mutex_acquire(&sched->status_lock);
@@ -88,7 +88,7 @@ unsigned int gk20a_sched_dev_poll(struct file *filp, poll_table *wait)
         gk20a_dbg(gpu_dbg_fn | gpu_dbg_sched, "");
 
         nvgpu_mutex_acquire(&sched->status_lock);
-        poll_wait(filp, &sched->readout_wq, wait);
+        poll_wait(filp, &sched->readout_wq.wq, wait);
         if (sched->status)
                 mask |= POLLIN | POLLRDNORM;
         nvgpu_mutex_release(&sched->status_lock);
@@ -552,7 +552,7 @@ void gk20a_sched_ctrl_tsg_added(struct gk20a *g, struct tsg_gk20a *tsg)
         NVGPU_SCHED_SET(tsg->tsgid, sched->recent_tsg_bitmap);
         sched->status |= NVGPU_SCHED_STATUS_TSG_OPEN;
         nvgpu_mutex_release(&sched->status_lock);
-        wake_up_interruptible(&sched->readout_wq);
+        nvgpu_cond_signal_interruptible(&sched->readout_wq);
 }
 
 void gk20a_sched_ctrl_tsg_removed(struct gk20a *g, struct tsg_gk20a *tsg)
@@ -609,7 +609,7 @@ int gk20a_sched_ctrl_init(struct gk20a *g)
                 goto free_recent;
         }
 
-        init_waitqueue_head(&sched->readout_wq);
+        nvgpu_cond_init(&sched->readout_wq);
 
         err = nvgpu_mutex_init(&sched->status_lock);
         if (err)
diff --git a/drivers/gpu/nvgpu/gk20a/sched_gk20a.h b/drivers/gpu/nvgpu/gk20a/sched_gk20a.h
index a54553c1..0cdb9914 100644
--- a/drivers/gpu/nvgpu/gk20a/sched_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/sched_gk20a.h
@@ -44,7 +44,7 @@ struct gk20a_sched_ctrl {
         u64 *recent_tsg_bitmap;
         u64 *ref_tsg_bitmap;
 
-        wait_queue_head_t readout_wq;
+        struct nvgpu_cond readout_wq;
 };
 
 int gk20a_sched_dev_release(struct inode *inode, struct file *filp);