3 files changed, 4 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 7400a9e4..717e5487 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -725,11 +725,10 @@ 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 (platform->is_fmodel) {
+        if (g->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 24acf29c..c190a83c 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -183,14 +183,13 @@ 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);
         u32 val;
 
         gops->clock_gating = gm20b_ops.clock_gating;
         gops->securegpccs = false;
         gops->pmupstate = false;
 #ifdef CONFIG_TEGRA_ACR
-        if (platform->is_fmodel) {
+        if (g->is_fmodel) {
                 gops->privsecurity = 1;
         } else {
                 val = gk20a_readl(g, fuse_opt_priv_sec_en_r());
@@ -202,7 +201,7 @@ int gm20b_init_hal(struct gk20a *g)
                 }
         }
 #else
-        if (platform->is_fmodel) {
+        if (g->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 17882e72..90504e52 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -49,7 +49,6 @@ 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("");
 
@@ -82,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 (platform->is_fmodel)
+        if (g->is_fmodel)
                 err = gk20a_ltc_alloc_phys_cbc(g, compbit_backing_size);
         else
                 err = gk20a_ltc_alloc_virt_cbc(g, compbit_backing_size);