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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1331565
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index c502add5..5b27953e 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -618,7 +618,8 @@ int gk20a_ce_execute_ops(struct device *dev,
                 memcpy((void *)&ce_cmd_buf_fence_in,
                                 (void *)(cmd_buf_cpu_va + fence_index),
                                 sizeof(struct gk20a_fence *));
-                ret = gk20a_fence_wait(ce_cmd_buf_fence_in, gk20a_get_gr_idle_timeout(g));
+                ret = gk20a_fence_wait(g, ce_cmd_buf_fence_in,
+                                       gk20a_get_gr_idle_timeout(g));
 
                 gk20a_fence_put(ce_cmd_buf_fence_in);
                 /* Reset the stored last pre-sync */
@@ -645,7 +646,8 @@ int gk20a_ce_execute_ops(struct device *dev,
         if (methodSize) {
                 /* TODO: Remove CPU pre-fence wait */
                 if (gk20a_fence_in) {
-                        ret = gk20a_fence_wait(gk20a_fence_in, gk20a_get_gr_idle_timeout(g));
+                        ret = gk20a_fence_wait(g, gk20a_fence_in,
+                                               gk20a_get_gr_idle_timeout(g));
                         gk20a_fence_put(gk20a_fence_in);
                         if (ret)
                                 goto noop;