summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/hal_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/hal_gm20b.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 227b6b6c..bb18d2d7 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -634,7 +634,6 @@ int gm20b_init_hal(struct gk20a *g)
634 __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); 634 __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false);
635 __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); 635 __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false);
636 636
637#ifdef CONFIG_TEGRA_ACR
638 if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { 637 if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
639 __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); 638 __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
640 } else { 639 } else {
@@ -646,21 +645,6 @@ int gm20b_init_hal(struct gk20a *g)
646 __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); 645 __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
647 } 646 }
648 } 647 }
649#else
650 if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
651 gk20a_dbg_info("running ASIM with PRIV security disabled");
652 __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false);
653 } else {
654 val = gk20a_readl(g, fuse_opt_priv_sec_en_r());
655 if (!val) {
656 __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false);
657 } else {
658 gk20a_dbg_info("priv security is not supported but enabled");
659 __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
660 return -EPERM;
661 }
662 }
663#endif
664 648
665 /* priv security dependent ops */ 649 /* priv security dependent ops */
666 if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { 650 if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {