diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index ae7864df4..25d037367 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -30,9 +30,11 @@ static void gr_gm20b_init_gpc_mmu(struct gk20a *g)
 
 	gk20a_dbg_info("initialize gpc mmu");
 
+#ifndef CONFIG_TEGRA_ACR
 	/* 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);
+#endif
 
 	temp = gk20a_readl(g, fb_mmu_ctrl_r());
 	temp &= gr_gpcs_pri_mmu_ctrl_vm_pg_size_m() |