1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 08e8b79f..ed48253f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -274,12 +274,23 @@ int gk20a_finalize_poweron(struct gk20a *g)
                 }
         }
 
+        nvgpu_mutex_acquire(&g->tpc_pg_lock);
+
+        if (g->can_tpc_powergate) {
+                if (g->ops.gr.powergate_tpc != NULL) {
+                        g->ops.gr.powergate_tpc(g);
+                }
+        }
+
         err = gk20a_init_gr_support(g);
         if (err) {
                 nvgpu_err(g, "failed to init gk20a gr");
+                nvgpu_mutex_release(&g->tpc_pg_lock);
                 goto done;
         }
 
+        nvgpu_mutex_release(&g->tpc_pg_lock);
+
         if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) {
                 err = gk20a_init_pstate_pmu_support(g);
                 if (err) {