3 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index d57b0fb5..c2aa64ba 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -709,10 +709,11 @@ static int gr_gm20b_load_ctxsw_ucode(struct gk20a *g)
         u32 reg_offset = gr_gpcs_gpccs_falcon_hwcfg_r() -
           gr_fecs_falcon_hwcfg_r();
         u8 falcon_id_mask = 0;
+        struct gk20a_platform *platform = dev_get_drvdata(g->dev);
 
         gk20a_dbg_fn("");
 
-        if (tegra_platform_is_linsim()) {
+        if (platform->is_fmodel) {
                 gk20a_writel(g, gr_fecs_ctxsw_mailbox_r(7),
                         gr_fecs_ctxsw_mailbox_value_f(0xc0de7777));
                 gk20a_writel(g, gr_gpccs_ctxsw_mailbox_r(7),
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 57cafd38..caf6a2eb 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -177,11 +177,12 @@ int gm20b_init_hal(struct gk20a *g)
 {
         struct gpu_ops *gops = &g->ops;
         struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics;
+        struct gk20a_platform *platform = dev_get_drvdata(g->dev);
 
         *gops = gm20b_ops;
         gops->securegpccs = false;
 #ifdef CONFIG_TEGRA_ACR
-        if (tegra_platform_is_linsim()) {
+        if (platform->is_fmodel) {
                 gops->privsecurity = 1;
         } else {
                 if (tegra_fuse_readl(FUSE_OPT_PRIV_SEC_DIS_0) &
@@ -193,7 +194,7 @@ int gm20b_init_hal(struct gk20a *g)
                 }
         }
 #else
-        if (tegra_platform_is_linsim()) {
+        if (platform->is_fmodel) {
                 gk20a_dbg_info("running ASIM with PRIV security disabled");
                 gops->privsecurity = 0;
         } else {
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 56df6a5d..fee9a807 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -48,6 +48,7 @@ static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         u32 compbit_backing_size;
 
         int err;
+        struct gk20a_platform *platform = dev_get_drvdata(g->dev);
 
         gk20a_dbg_fn("");
 
@@ -80,7 +81,7 @@ static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         gk20a_dbg_info("max comptag lines : %d",
                 max_comptag_lines);
 
-        if (tegra_platform_is_linsim())
+        if (platform->is_fmodel)
                 err = gk20a_ltc_alloc_phys_cbc(g, compbit_backing_size);
         else
                 err = gk20a_ltc_alloc_virt_cbc(g, compbit_backing_size);