2 files changed, 19 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) {
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 948d8e60..4934958c 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -307,6 +307,7 @@ struct gpu_ops {
                           u32 class, u32 padding);
                 void (*free_gr_ctx)(struct gk20a *g,
                                     struct vm_gk20a *vm, struct nvgpu_gr_ctx *gr_ctx);
+                void (*powergate_tpc)(struct gk20a *g);
                 void (*update_ctxsw_preemption_mode)(struct gk20a *g,
                                 struct channel_gk20a *c,
                                 struct nvgpu_mem *mem);
@@ -1361,6 +1362,8 @@ struct gk20a {
         u64 log_mask;
         u32 log_trace;
 
+        struct nvgpu_mutex tpc_pg_lock;
+
         struct nvgpu_gpu_params params;
 
         /*
@@ -1532,6 +1535,11 @@ struct gk20a {
 
         u32 tpc_fs_mask_user;
 
+        u32 tpc_pg_mask;
+        bool can_tpc_powergate;
+
+        u32 valid_tpc_mask;
+
         struct nvgpu_bios bios;
         bool bios_is_init;