1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 223c7727..2dfe9e58 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -165,6 +165,11 @@ int gk20a_finalize_poweron(struct gk20a *g)
                 goto done;
         }
 
+        if (g->ops.acr.acr_sw_init != NULL &&
+                nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
+                g->ops.acr.acr_sw_init(g, &g->acr);
+        }
+
         if (g->ops.bios.init) {
                 err = g->ops.bios.init(g);
         }
@@ -273,6 +278,15 @@ int gk20a_finalize_poweron(struct gk20a *g)
                 }
         }
 
+        if (g->acr.bootstrap_hs_acr != NULL &&
+                nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
+                err = g->acr.bootstrap_hs_acr(g, &g->acr, &g->acr.acr);
+                if (err != 0) {
+                        nvgpu_err(g, "ACR bootstrap failed");
+                        goto done;
+                }
+        }
+
         if (g->ops.pmu.is_pmu_supported(g)) {
                 err = nvgpu_init_pmu_support(g);
                 if (err) {