From 19fdb429c2b04d13faecad8b2e5466e9f3c7b8c7 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 29 Mar 2017 15:00:24 -0700 Subject: gpu: nvgpu: Wrappers for checking platform type Add nvgpu_* wrappers for determining if we're running in simulation or silicon, and if we're running in hypervisor. The new wrappers require struct gk20a pointer, and gk20a_fence_wait() did not have access to one. Add struct gk20a pointer as the first parameter. JIRA NVGPU-16 Change-Id: I73b2b8f091ca29fb1827054abd2adaf583710331 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1331565 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fence_gk20a.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (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 426556cc..77dae9a7 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h @@ -25,6 +25,7 @@ struct sync_timeline; struct sync_fence; struct nvgpu_semaphore; struct channel_gk20a; +struct gk20a; struct gk20a_fence_ops; @@ -83,7 +84,7 @@ void gk20a_init_fence(struct gk20a_fence *f, /* Fence operations */ void gk20a_fence_put(struct gk20a_fence *f); struct gk20a_fence *gk20a_fence_get(struct gk20a_fence *f); -int gk20a_fence_wait(struct gk20a_fence *f, int timeout); +int gk20a_fence_wait(struct gk20a *g, struct gk20a_fence *f, int timeout); bool gk20a_fence_is_expired(struct gk20a_fence *f); int gk20a_fence_install_fd(struct gk20a_fence *f); -- cgit v1.2.2