2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
index b2a815fb..2ca8d86c 100644
--- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c
@@ -42,6 +42,12 @@ void fb_gm20b_init_fs_state(struct gk20a *g)
 
         gk20a_writel(g, fb_fbhub_num_active_ltcs_r(),
                         g->ltc_count);
+
+        if (!nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
+                /* Bypass MMU check for non-secure boot. For
+                 * secure-boot,this register write has no-effect */
+                gk20a_writel(g, fb_priv_mmu_phy_secure_r(), 0xffffffffU);
+        }
 }
 
 void gm20b_fb_set_mmu_page_size(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index f9eb97ce..85da0d35 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -49,11 +49,6 @@ void gr_gm20b_init_gpc_mmu(struct gk20a *g)
 
         nvgpu_log_info(g, "initialize gpc mmu");
 
-        if (!nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
-                /* Bypass MMU check for non-secure boot. For
-                 * secure-boot,this register write has no-effect */
-                gk20a_writel(g, fb_priv_mmu_phy_secure_r(), 0xffffffff);
-        }
         temp = gk20a_readl(g, fb_mmu_ctrl_r());
         temp &= gr_gpcs_pri_mmu_ctrl_vm_pg_size_m() |
                 gr_gpcs_pri_mmu_ctrl_use_pdb_big_page_size_m() |