From f554ab30463438e5ce76ecf897a527ba5881fdbf Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Tue, 1 Jul 2014 16:49:46 -0700 Subject: gpu: nvgpu: Exclude non-secure boot with CONFIG_TEGRA_ACR Do not compile non-secure boot code if CONFIG_TEGRA_ACR is defined. Bug 1524197 Change-Id: Id1ec222e00e2229e1d28e406e4ddad99e368296e Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/433356 Reviewed-by: Yu-Huan Hsu --- drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index ae7864df..25d03736 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() | -- cgit v1.2.2