10 files changed, 28 insertions, 32 deletions

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 <http://www.gnu.org/licenses/>.
  */
 
-#include <soc/tegra/chip-id.h>
-
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/log.h>
+#include <nvgpu/soc.h>
 
 #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(),
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;
diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
index 443cd5e1..baffed46 100644
--- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
@@ -25,6 +25,7 @@
 #include "gk20a.h"
 
 #include <nvgpu/log.h>
+#include <nvgpu/soc.h>
 
 #include <nvgpu/hw/gk20a/hw_trim_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_timer_gk20a.h>
@@ -268,7 +269,7 @@ static int clk_program_gpc_pll(struct gk20a *g, struct clk_gk20a *clk,
 
         gk20a_dbg_fn("");
 
-        if (!tegra_platform_is_silicon())
+        if (!nvgpu_platform_is_silicon(g))
                 return 0;
 
         /* get old coefficients */
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
index a5aeae08..c886101c 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
@@ -19,6 +19,7 @@
 
 #include <nvgpu/semaphore.h>
 #include <nvgpu/kmem.h>
+#include <nvgpu/soc.h>
 
 #include "gk20a.h"
 #include "channel_gk20a.h"
@@ -80,10 +81,10 @@ static inline bool gk20a_fence_is_valid(struct gk20a_fence *f)
         return valid;
 }
 
-int gk20a_fence_wait(struct gk20a_fence *f, int timeout)
+int gk20a_fence_wait(struct gk20a *g, struct gk20a_fence *f, int timeout)
 {
         if (f && gk20a_fence_is_valid(f)) {
-                if (!tegra_platform_is_silicon())
+                if (!nvgpu_platform_is_silicon(g))
                         timeout = (u32)MAX_SCHEDULE_TIMEOUT;
                 return f->ops->wait(f, timeout);
         }
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
index 426556cc..77dae9a7 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h
@@ -25,6 +25,7 @@ struct sync_timeline;
 struct sync_fence;
 struct nvgpu_semaphore;
 struct channel_gk20a;
+struct gk20a;
 
 struct gk20a_fence_ops;
 
@@ -83,7 +84,7 @@ void gk20a_init_fence(struct gk20a_fence *f,
 /* Fence operations */
 void gk20a_fence_put(struct gk20a_fence *f);
 struct gk20a_fence *gk20a_fence_get(struct gk20a_fence *f);
-int gk20a_fence_wait(struct gk20a_fence *f, int timeout);
+int gk20a_fence_wait(struct gk20a *g, struct gk20a_fence *f, int timeout);
 bool gk20a_fence_is_expired(struct gk20a_fence *f);
 int gk20a_fence_install_fd(struct gk20a_fence *f);
 
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index c7db67fe..bdd068fe 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -31,6 +31,7 @@
 #include <nvgpu/semaphore.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
+#include <nvgpu/soc.h>
 
 #include "gk20a.h"
 #include "debug_gk20a.h"
@@ -3349,7 +3350,7 @@ static void gk20a_fifo_apply_pb_timeout(struct gk20a *g)
 {
         u32 timeout;
 
-        if (tegra_platform_is_silicon()) {
+        if (nvgpu_platform_is_silicon(g)) {
                 timeout = gk20a_readl(g, fifo_pb_timeout_r());
                 timeout &= ~fifo_pb_timeout_detection_enabled_f();
                 gk20a_writel(g, fifo_pb_timeout_r(), timeout);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 5fc57494..339656c7 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -43,6 +43,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/allocator.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/soc.h>
 
 #include "gk20a.h"
 #include "debug_gk20a.h"
@@ -295,7 +296,7 @@ static int gk20a_init_support(struct platform_device *dev)
                 goto fail;
         }
 
-        if (tegra_cpu_is_asim()) {
+        if (nvgpu_platform_is_simulation(g)) {
                 err = gk20a_init_sim_support(dev);
                 if (err)
                         goto fail;
@@ -954,9 +955,6 @@ static int gk20a_probe(struct platform_device *dev)
                 return -ENODATA;
         }
 
-        if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
-                platform->is_fmodel = true;
-
         gk20a_dbg_fn("");
 
         platform_set_drvdata(dev, platform);
@@ -973,6 +971,9 @@ static int gk20a_probe(struct platform_device *dev)
         set_gk20a(dev, gk20a);
         gk20a->dev = &dev->dev;
 
+        if (nvgpu_platform_is_simulation(gk20a))
+                platform->is_fmodel = true;
+
         nvgpu_kmem_init(gk20a);
 
         gk20a->irq_stall = platform_get_irq(dev, 0);
@@ -1030,7 +1031,7 @@ static int gk20a_probe(struct platform_device *dev)
                 return err;
         }
 
-        gk20a->mm.has_physical_mode = !is_tegra_hypervisor_mode();
+        gk20a->mm.has_physical_mode = !nvgpu_is_hypervisor_mode(gk20a);
 
         return 0;
 }
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 9d931520..1cff8dd5 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -34,7 +34,6 @@ struct dbg_profiler_object_data;
 #include <nvgpu/lock.h>
 #include <linux/nvgpu.h>
 #include <linux/irqreturn.h>
-#include <soc/tegra/chip-id.h>
 #include <linux/version.h>
 #include <linux/atomic.h>
 #include <linux/cdev.h>
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));
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 38b8da9c..7df0c71c 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -3642,19 +3642,10 @@ static int pmu_pg_init_send(struct gk20a *g, u32 pg_engine_id)
 
         gk20a_dbg_fn("");
 
-        if (tegra_cpu_is_asim()) {
-                /* TBD: calculate threshold for silicon */
-                gk20a_writel(g, pwr_pmu_pg_idlefilth_r(pg_engine_id),
-                        PMU_PG_IDLE_THRESHOLD_SIM);
-                gk20a_writel(g, pwr_pmu_pg_ppuidlefilth_r(pg_engine_id),
-                        PMU_PG_POST_POWERUP_IDLE_THRESHOLD_SIM);
-        } else {
-                /* TBD: calculate threshold for silicon */
-                gk20a_writel(g, pwr_pmu_pg_idlefilth_r(pg_engine_id),
-                        PMU_PG_IDLE_THRESHOLD);
-                gk20a_writel(g, pwr_pmu_pg_ppuidlefilth_r(pg_engine_id),
-                        PMU_PG_POST_POWERUP_IDLE_THRESHOLD);
-        }
+        gk20a_writel(g, pwr_pmu_pg_idlefilth_r(pg_engine_id),
+                PMU_PG_IDLE_THRESHOLD);
+        gk20a_writel(g, pwr_pmu_pg_ppuidlefilth_r(pg_engine_id),
+                PMU_PG_POST_POWERUP_IDLE_THRESHOLD);
 
         if (g->ops.pmu.pmu_pg_init_param)
                 g->ops.pmu.pmu_pg_init_param(g, pg_engine_id);