diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
index 3cdeedcc2..ca74f243e 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
@@ -206,7 +206,7 @@ int nvgpu_pmu_enable_elpg(struct gk20a *g)
 		pg_engine_id++) {
 
 		if (pg_engine_id == PMU_PG_ELPG_ENGINE_ID_MS &&
-			ACCESS_ONCE(pmu->mscg_stat) == PMU_MSCG_DISABLED)
+			pmu->mscg_stat == PMU_MSCG_DISABLED)
 			continue;
 
 		if (BIT(pg_engine_id) & pg_engine_id_list)
@@ -281,7 +281,7 @@ int nvgpu_pmu_disable_elpg(struct gk20a *g)
 		pg_engine_id++) {
 
 		if (pg_engine_id == PMU_PG_ELPG_ENGINE_ID_MS &&
-			ACCESS_ONCE(pmu->mscg_stat) == PMU_MSCG_DISABLED)
+			pmu->mscg_stat == PMU_MSCG_DISABLED)
 			continue;
 
 		if (BIT(pg_engine_id) & pg_engine_id_list) {
diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.c b/drivers/gpu/nvgpu/lpwr/lpwr.c
index c80ddee02..b11895905 100644
--- a/drivers/gpu/nvgpu/lpwr/lpwr.c
+++ b/drivers/gpu/nvgpu/lpwr/lpwr.c
@@ -352,11 +352,8 @@ int nvgpu_lpwr_enable_pg(struct gk20a *g, bool pstate_lock)
 	is_mscg_supported = nvgpu_lpwr_is_mscg_supported(g,
 			present_pstate);
 	if (is_mscg_supported && g->mscg_enabled) {
-		if (!ACCESS_ONCE(pmu->mscg_stat)) {
-			WRITE_ONCE(pmu->mscg_stat, PMU_MSCG_ENABLED);
-			/* make status visible */
-			smp_mb();
-		}
+		if (!pmu->mscg_stat)
+			pmu->mscg_stat = PMU_MSCG_ENABLED;
 	}
 
 	is_rppg_supported = nvgpu_lpwr_is_rppg_supported(g,
@@ -402,11 +399,8 @@ int nvgpu_lpwr_disable_pg(struct gk20a *g, bool pstate_lock)
 	is_mscg_supported = nvgpu_lpwr_is_mscg_supported(g,
 			present_pstate);
 	if (is_mscg_supported && g->mscg_enabled) {
-		if (ACCESS_ONCE(pmu->mscg_stat)) {
-			WRITE_ONCE(pmu->mscg_stat, PMU_MSCG_DISABLED);
-			/* make status visible */
-			smp_mb();
-		}
+		if (pmu->mscg_stat)
+			pmu->mscg_stat = PMU_MSCG_DISABLED;
 	}
 
 exit_unlock: