1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/power_features/pg/pg.c b/drivers/gpu/nvgpu/common/power_features/pg/pg.c
index fa31f4e3..394c0824 100644
--- a/drivers/gpu/nvgpu/common/power_features/pg/pg.c
+++ b/drivers/gpu/nvgpu/common/power_features/pg/pg.c
@@ -46,6 +46,8 @@ int nvgpu_pg_elpg_enable(struct gk20a *g)
                 return 0;
         }
 
+        gk20a_gr_wait_initialized(g);
+
         nvgpu_mutex_acquire(&g->cg_pg_lock);
         if (g->elpg_enabled) {
                 err = nvgpu_pmu_pg_global_enable(g, true);
@@ -64,6 +66,8 @@ int nvgpu_pg_elpg_disable(struct gk20a *g)
                 return 0;
         }
 
+        gk20a_gr_wait_initialized(g);
+
         nvgpu_mutex_acquire(&g->cg_pg_lock);
         if (g->elpg_enabled) {
                 err = nvgpu_pmu_pg_global_enable(g, false);
@@ -83,6 +87,8 @@ int nvgpu_pg_elpg_set_elpg_enabled(struct gk20a *g, bool enable)
                 return 0;
         }
 
+        gk20a_gr_wait_initialized(g);
+
         nvgpu_mutex_acquire(&g->cg_pg_lock);
         if (enable) {
                 if (!g->elpg_enabled) {