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/bus_gk20a.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/bus_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c index 3119e373..e81a5b2a 100644 --- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.c @@ -14,10 +14,9 @@ * along with this program. If not, see . */ -#include - #include #include +#include #include "gk20a.h" @@ -31,7 +30,7 @@ void gk20a_bus_init_hw(struct gk20a *g) struct gk20a_platform *platform = gk20a_get_platform(g->dev); /* enable pri timeout only on silicon */ - if (tegra_platform_is_silicon()) { + if (nvgpu_platform_is_silicon(g)) { gk20a_writel(g, timer_pri_timeout_r(), timer_pri_timeout_period_f( @@ -46,7 +45,7 @@ void gk20a_bus_init_hw(struct gk20a *g) timer_pri_timeout_en_en_disabled_f()); } - if (!tegra_platform_is_silicon()) + if (!nvgpu_platform_is_silicon(g)) gk20a_writel(g, bus_intr_en_0_r(), 0x0); else gk20a_writel(g, bus_intr_en_0_r(), -- cgit v1.2.2