summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-04-25 16:51:27 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-05-16 13:24:57 -0400
commit80a6291c9c5e373a3a534ba100b616b6789fb568 (patch)
tree20a5c5c3c1ea0933fa9db6af61a89c2ebd027ae0 /drivers/gpu/nvgpu/common
parent7bc97ca7d5e0cee265014ce5fd682858c3b63629 (diff)
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>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_channel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 79cea30c..8a87e4cb 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -413,8 +413,8 @@ static int gk20a_channel_wait_semaphore(struct channel_gk20a *ch,
413 413
414 semaphore = data + (offset & ~PAGE_MASK); 414 semaphore = data + (offset & ~PAGE_MASK);
415 415
416 remain = wait_event_interruptible_timeout( 416 remain = NVGPU_COND_WAIT_INTERRUPTIBLE(
417 ch->semaphore_wq, 417 &ch->semaphore_wq,
418 *semaphore == payload || ch->has_timedout, 418 *semaphore == payload || ch->has_timedout,
419 timeout); 419 timeout);
420 420