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/gk20a/fence_gk20a.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h index 87fa9fdb..c479f359 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h @@ -17,8 +17,6 @@ #ifndef _GK20A_FENCE_H_ #define _GK20A_FENCE_H_ -#include - #include struct platform_device; @@ -42,7 +40,7 @@ struct gk20a_fence { /* Valid for fences created from semaphores: */ struct nvgpu_semaphore *semaphore; - wait_queue_head_t *semaphore_wq; + struct nvgpu_cond *semaphore_wq; /* Valid for fences created from syncpoints: */ struct platform_device *host1x_pdev; @@ -59,7 +57,7 @@ int gk20a_fence_from_semaphore( struct gk20a_fence *fence_out, struct sync_timeline *timeline, struct nvgpu_semaphore *semaphore, - wait_queue_head_t *semaphore_wq, + struct nvgpu_cond *semaphore_wq, bool wfi, bool need_sync_fence); int gk20a_fence_from_syncpt( -- cgit v1.2.2