diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 0d615d65..65dc1c72 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -1689,7 +1689,7 @@ static int __gk20a_channel_worker_wakeup(struct gk20a *g) | |||
1689 | */ | 1689 | */ |
1690 | 1690 | ||
1691 | put = atomic_inc_return(&g->channel_worker.put); | 1691 | put = atomic_inc_return(&g->channel_worker.put); |
1692 | wake_up(&g->channel_worker.wq); | 1692 | nvgpu_cond_signal(&g->channel_worker.wq); |
1693 | 1693 | ||
1694 | return put; | 1694 | return put; |
1695 | } | 1695 | } |
@@ -1783,8 +1783,8 @@ static int gk20a_channel_poll_worker(void *arg) | |||
1783 | while (!nvgpu_thread_should_stop(&worker->poll_task)) { | 1783 | while (!nvgpu_thread_should_stop(&worker->poll_task)) { |
1784 | bool got_events; | 1784 | bool got_events; |
1785 | 1785 | ||
1786 | got_events = wait_event_timeout( | 1786 | got_events = NVGPU_COND_WAIT( |
1787 | worker->wq, | 1787 | &worker->wq, |
1788 | __gk20a_channel_worker_pending(g, get), | 1788 | __gk20a_channel_worker_pending(g, get), |
1789 | timeout) > 0; | 1789 | timeout) > 0; |
1790 | 1790 | ||
@@ -1808,7 +1808,7 @@ int nvgpu_channel_worker_init(struct gk20a *g) | |||
1808 | char thread_name[64]; | 1808 | char thread_name[64]; |
1809 | 1809 | ||
1810 | atomic_set(&g->channel_worker.put, 0); | 1810 | atomic_set(&g->channel_worker.put, 0); |
1811 | init_waitqueue_head(&g->channel_worker.wq); | 1811 | nvgpu_cond_init(&g->channel_worker.wq); |
1812 | nvgpu_init_list_node(&g->channel_worker.items); | 1812 | nvgpu_init_list_node(&g->channel_worker.items); |
1813 | nvgpu_spinlock_init(&g->channel_worker.items_lock); | 1813 | nvgpu_spinlock_init(&g->channel_worker.items_lock); |
1814 | snprintf(thread_name, sizeof(thread_name), | 1814 | snprintf(thread_name, sizeof(thread_name), |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 6d1707a6..c36049b9 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1166,7 +1166,7 @@ struct gk20a { | |||
1166 | struct gk20a_channel_worker { | 1166 | struct gk20a_channel_worker { |
1167 | struct nvgpu_thread poll_task; | 1167 | struct nvgpu_thread poll_task; |
1168 | atomic_t put; | 1168 | atomic_t put; |
1169 | wait_queue_head_t wq; | 1169 | struct nvgpu_cond wq; |
1170 | struct nvgpu_list_node items; | 1170 | struct nvgpu_list_node items; |
1171 | struct nvgpu_spinlock items_lock; | 1171 | struct nvgpu_spinlock items_lock; |
1172 | } channel_worker; | 1172 | } channel_worker; |