From 80a6291c9c5e373a3a534ba100b616b6789fb568 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 25 Apr 2017 13:51:27 -0700 Subject: 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 Reviewed-on: http://git-master/r/1469852 Reviewed-by: mobile promotions Tested-by: mobile promotions --- 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 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, semaphore = data + (offset & ~PAGE_MASK); - remain = wait_event_interruptible_timeout( - ch->semaphore_wq, + remain = NVGPU_COND_WAIT_INTERRUPTIBLE( + &ch->semaphore_wq, *semaphore == payload || ch->has_timedout, timeout); -- cgit v1.2.2