1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/power_features/power_features.c b/drivers/gpu/nvgpu/common/power_features/power_features.c
index 792fdc01..7f52ba8e 100644
--- a/drivers/gpu/nvgpu/common/power_features/power_features.c
+++ b/drivers/gpu/nvgpu/common/power_features/power_features.c
@@ -31,6 +31,8 @@ int nvgpu_cg_pg_disable(struct gk20a *g)
 
         nvgpu_log_fn(g, " ");
 
+        gk20a_gr_wait_initialized(g);
+
         /* disable elpg before clock gating */
         err = nvgpu_pg_elpg_disable(g);
         if (err != 0) {
@@ -51,6 +53,8 @@ int nvgpu_cg_pg_enable(struct gk20a *g)
 
         nvgpu_log_fn(g, " ");
 
+        gk20a_gr_wait_initialized(g);
+
         nvgpu_cg_elcg_enable(g);
 
         nvgpu_cg_blcg_mode_enable(g);