3 files changed, 42 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/soc.c b/drivers/gpu/nvgpu/common/linux/soc.c
new file mode 100644
index 00000000..d2bb5275
--- /dev/null
+++ b/drivers/gpu/nvgpu/common/linux/soc.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include <soc/tegra/chip-id.h>
+
+#include <nvgpu/soc.h>
+
+bool nvgpu_platform_is_silicon(struct gk20a *g)
+{
+        return tegra_platform_is_silicon();
+}
+
+bool nvgpu_platform_is_simulation(struct gk20a *g)
+{
+        return tegra_platform_is_linsim() || tegra_platform_is_vdk();
+}
+
+bool nvgpu_is_hypervisor_mode(struct gk20a *g)
+{
+        return is_tegra_hypervisor_mode();
+}
diff --git a/drivers/gpu/nvgpu/common/linux/timers.c b/drivers/gpu/nvgpu/common/linux/timers.c
index 07eb357a..9fe84b50 100644
--- a/drivers/gpu/nvgpu/common/linux/timers.c
+++ b/drivers/gpu/nvgpu/common/linux/timers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 
 #include <nvgpu/timers.h>
+#include <nvgpu/soc.h>
 
 #include "gk20a/gk20a.h"
 
@@ -31,7 +32,7 @@ static int nvgpu_timeout_is_pre_silicon(struct nvgpu_timeout *timeout)
         if (timeout->flags & NVGPU_TIMER_NO_PRE_SI)
                 return 0;
 
-        return !tegra_platform_is_silicon();
+        return !nvgpu_platform_is_silicon(timeout->g);
 }
 
 /**
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 <nvgpu/kmem.h>
 #include <nvgpu/nvgpu_common.h>
+#include <nvgpu/soc.h>
 
 #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;