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, 2 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 78332ee7..7472c7cd 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -569,7 +569,7 @@ static int gk20a_vidmem_clear_all(struct gk20a *g)
                                    NVGPU_TIMER_CPU_TIMER);
 
                 do {
-                        err = gk20a_fence_wait(gk20a_fence_out,
+                        err = gk20a_fence_wait(g, gk20a_fence_out,
                                                gk20a_get_gr_idle_timeout(g));
                 } while (err == -ERESTARTSYS &&
                          !nvgpu_timeout_expired(&timeout));
@@ -2560,7 +2560,7 @@ static int gk20a_gmmu_clear_vidmem_mem(struct gk20a *g, struct nvgpu_mem *mem)
                                    NVGPU_TIMER_CPU_TIMER);
 
                 do {
-                        err = gk20a_fence_wait(gk20a_last_fence,
+                        err = gk20a_fence_wait(g, gk20a_last_fence,
                                                gk20a_get_gr_idle_timeout(g));
                 } while (err == -ERESTARTSYS &&
                          !nvgpu_timeout_expired(&timeout));