gpu: nvgpu: Greatly simplify the semaphore detection

Greatly simplify and make more robust the gpu semaphore detection
in sync_fences. Instead of using a magic number use the parent
timeline of sync_pts.

This will also work with multi-GPU setups using nvgpu since the
timeline ops pointer will be the same across all instances of
nvgpu.

Bug 1732449

Reviewed-on: http://git-master/r/1203834
(cherry picked from commit 66eeb577eae5d10741fd15f3659e843c70792cd6)
Change-Id: I4c6619d70b5531e2676e18d1330724e8f8b9bcb3
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1221042
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/sync_gk20a.h
index f885febd..e5b31471 100644
--- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.h
@@ -27,15 +27,8 @@ struct sync_pt;
 struct gk20a_semaphore;
 struct fence;
 
-int __gk20a_is_gk20a_sync_pt_inst(struct sync_pt *pt);
-int gk20a_is_gk20a_sync_pt_inst(struct fence *f);
 int gk20a_is_sema_backed_sync_fence(struct sync_fence *fence);
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-struct gk20a_semaphore *gk20a_sync_pt_inst_get_sema(struct fence *f);
-#else
-struct gk20a_semaphore *gk20a_sync_pt_inst_get_sema(struct sync_pt *pt);
-#endif
+struct gk20a_semaphore *gk20a_sync_fence_get_sema(struct sync_fence *f);
 
 #ifdef CONFIG_SYNC
 struct sync_timeline *gk20a_sync_timeline_create(const char *fmt, ...);