1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c
index f86dc2c2..b9cfd033 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu.c
@@ -30,6 +30,8 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/gk20a.h>
+#include <nvgpu/power_features/cg.h>
+
 
 static int nvgpu_pg_init_task(void *arg);
 
@@ -44,15 +46,9 @@ static int pmu_enable_hw(struct nvgpu_pmu *pmu, bool enable)
                 /* bring PMU falcon/engine out of reset */
                 g->ops.pmu.reset_engine(g, true);
 
-                if (g->ops.clock_gating.slcg_pmu_load_gating_prod) {
-                        g->ops.clock_gating.slcg_pmu_load_gating_prod(g,
-                                g->slcg_enabled);
-                }
+                nvgpu_cg_slcg_pmu_load_enable(g);
 
-                if (g->ops.clock_gating.blcg_pmu_load_gating_prod) {
-                        g->ops.clock_gating.blcg_pmu_load_gating_prod(g,
-                                g->blcg_enabled);
-                }
+                nvgpu_cg_blcg_pmu_load_enable(g);
 
                 if (nvgpu_flcn_mem_scrub_wait(pmu->flcn)) {
                         /* keep PMU falcon/engine in reset
@@ -446,7 +442,7 @@ static void pmu_setup_hw_enable_elpg(struct gk20a *g)
                 g->ops.gr.pmu_save_zbc(g, 0xf);
         }
 
-        if (g->elpg_enabled) {
+        if (g->can_elpg && g->elpg_enabled) {
                 /* Init reg with prod values*/
                 if (g->ops.pmu.pmu_setup_elpg) {
                         g->ops.pmu.pmu_setup_elpg(g);