From 0ebe462c130108a027f85bcb6736fed2ef74204e Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 25 Apr 2017 13:54:58 -0700 Subject: gpu: nvgpu: Use nvgpu_cond in notifier wq Change notifier wait queue to use nvgpu_cond instead of Linux wait queue. JIRA NVGPU-14 Change-Id: I197a0ef6c0a2331ca0dbb3480bdb89d45ba73020 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1469853 Reviewed-by: Alex Waterman Reviewed-by: Automatic_Commit_Validation_User --- drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index d81328f0..2c9fac0b 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c @@ -476,8 +476,8 @@ static int gk20a_channel_wait(struct channel_gk20a *ch, /* user should set status pending before * calling this ioctl */ - remain = wait_event_interruptible_timeout( - ch->notifier_wq, + remain = NVGPU_COND_WAIT_INTERRUPTIBLE( + &ch->notifier_wq, notif->status == 0 || ch->has_timedout, timeout); -- cgit v1.2.2