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/common/nvgpu_common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu/common/nvgpu_common.c') diff --git a/drivers/gpu/nvgpu/common/nvgpu_common.c b/drivers/gpu/nvgpu/common/nvgpu_common.c index a07a8f7d..f8f4a636 100644 --- a/drivers/gpu/nvgpu/common/nvgpu_common.c +++ b/drivers/gpu/nvgpu/common/nvgpu_common.c @@ -19,6 +19,7 @@ #include #include +#include #include "gk20a/gk20a_scale.h" #include "gk20a/gk20a.h" @@ -60,7 +61,7 @@ static void nvgpu_init_vars(struct gk20a *g) static void nvgpu_init_timeout(struct gk20a *g) { g->gr_idle_timeout_default = CONFIG_GK20A_DEFAULT_TIMEOUT; - if (tegra_platform_is_silicon()) + if (nvgpu_platform_is_silicon(g)) g->timeouts_enabled = true; } @@ -85,17 +86,17 @@ static void nvgpu_init_pm_vars(struct gk20a *g) * power features and for silicon platforms, read from platform data */ g->slcg_enabled = - tegra_platform_is_silicon() ? platform->enable_slcg : false; + nvgpu_platform_is_silicon(g) ? platform->enable_slcg : false; g->blcg_enabled = - tegra_platform_is_silicon() ? platform->enable_blcg : false; + nvgpu_platform_is_silicon(g) ? platform->enable_blcg : false; g->elcg_enabled = - tegra_platform_is_silicon() ? platform->enable_elcg : false; + nvgpu_platform_is_silicon(g) ? platform->enable_elcg : false; g->elpg_enabled = - tegra_platform_is_silicon() ? platform->enable_elpg : false; + nvgpu_platform_is_silicon(g) ? platform->enable_elpg : false; g->aelpg_enabled = - tegra_platform_is_silicon() ? platform->enable_aelpg : false; + nvgpu_platform_is_silicon(g) ? platform->enable_aelpg : false; g->mscg_enabled = - tegra_platform_is_silicon() ? platform->enable_mscg : false; + nvgpu_platform_is_silicon(g) ? platform->enable_mscg : false; /* set default values to aelpg parameters */ g->pmu.aelpg_param[0] = APCTRL_SAMPLING_PERIOD_PG_DEFAULT_US; -- cgit v1.2.2