1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 9c37fd02..326b4f96 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -458,11 +458,15 @@ void gk20a_gr_clear_sm_hww(struct gk20a *g,
 #define gr_gk20a_elpg_protected_call(g, func) \
         ({ \
                 int err = 0; \
-                if (support_gk20a_pmu(g->dev)) \
+                if (support_gk20a_pmu(g->dev) && g->elpg_enabled) {\
                         err = gk20a_pmu_disable_elpg(g); \
-                if (err) return err; \
+                        if (err) { \
+                                gk20a_pmu_enable_elpg(g); \
+                                return err; \
+                        } \
+                } \
                 err = func; \
-                if (support_gk20a_pmu(g->dev)) \
+                if (support_gk20a_pmu(g->dev) && g->elpg_enabled) \
                         gk20a_pmu_enable_elpg(g); \
                 err; \
         })