3 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index af26996b..67584f95 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -102,6 +102,8 @@ static void nvgpu_init_pm_vars(struct gk20a *g)
                 nvgpu_platform_is_silicon(g) ? platform->enable_aelpg : false;
         g->mscg_enabled =
                 nvgpu_platform_is_silicon(g) ? platform->enable_mscg : false;
+        g->can_elpg =
+                nvgpu_platform_is_silicon(g) ? platform->can_elpg : false;
 
         /* set default values to aelpg parameters */
         g->pmu.aelpg_param[0] = APCTRL_SAMPLING_PERIOD_PG_DEFAULT_US;
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 9860910c..76251000 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -981,6 +981,7 @@ struct gk20a {
         bool elcg_enabled;
         bool elpg_enabled;
         bool aelpg_enabled;
+        bool can_elpg;
         bool mscg_enabled;
         bool forced_idle;
         bool forced_reset;
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 0ca8851f..257d9f7c 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -3326,12 +3326,11 @@ void pmu_setup_hw(struct work_struct *work)
 {
         struct pmu_gk20a *pmu = container_of(work, struct pmu_gk20a, pg_init);
         struct gk20a *g = gk20a_from_pmu(pmu);
-        struct gk20a_platform *platform = dev_get_drvdata(g->dev);
 
         switch (pmu->pmu_state) {
         case PMU_STATE_INIT_RECEIVED:
                 gk20a_dbg_pmu("pmu starting");
-                if (platform->can_elpg)
+                if (g->can_elpg)
                         pmu_init_powergating(g);
                 break;
         case PMU_STATE_ELPG_BOOTED: