diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 2a871b5a6..b94eade1f 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -327,7 +327,6 @@ int gr_gk20a_wait_idle(struct gk20a *g, unsigned long duration_ms,
 		       u32 expect_delay)
 {
 	u32 delay = expect_delay;
-	bool gr_enabled;
 	bool ctxsw_active;
 	bool gr_busy;
 	u32 gr_engine_id;
@@ -346,9 +345,6 @@ int gr_gk20a_wait_idle(struct gk20a *g, unsigned long duration_ms,
 		   only when gr_status is read */
 		(void) gk20a_readl(g, gr_status_r());
 
-		gr_enabled = gk20a_readl(g, mc_enable_r()) &
-			mc_enable_pgraph_enabled_f();
-
 		engine_status = gk20a_readl(g,
 					fifo_engine_status_r(gr_engine_id));
 
@@ -362,8 +358,7 @@ int gr_gk20a_wait_idle(struct gk20a *g, unsigned long duration_ms,
 		gr_busy = gk20a_readl(g, gr_engine_status_r()) &
 			gr_engine_status_value_busy_f();
 
-		if (!gr_enabled || ctx_status_invalid
-				|| (!gr_busy && !ctxsw_active)) {
+		if (ctx_status_invalid || (!gr_busy && !ctxsw_active)) {
 			nvgpu_log_fn(g, "done");
 			return 0;
 		}
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 2fb700f08..db6f5618c 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -45,7 +45,6 @@
 #include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h>
-#include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 
 #define GFXP_WFI_TIMEOUT_COUNT_DEFAULT 100000
 
@@ -1452,7 +1451,6 @@ int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 			       u32 expect_delay)
 {
 	u32 delay = expect_delay;
-	bool gr_enabled;
 	bool ctxsw_active;
 	bool gr_busy;
 	u32 gr_status;
@@ -1468,9 +1466,6 @@ int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 		   only when gr_status is read */
 		gr_status = gk20a_readl(g, gr_status_r());
 
-		gr_enabled = gk20a_readl(g, mc_enable_r()) &
-			mc_enable_pgraph_enabled_f();
-
 		ctxsw_active = gr_status & 1<<7;
 
 		activity0 = gk20a_readl(g, gr_activity_0_r());
@@ -1483,7 +1478,7 @@ int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 			    activity2 == 0 &&
 			    gr_activity_empty_or_preempted(activity4));
 
-		if (!gr_enabled || (!gr_busy && !ctxsw_active)) {
+		if (!gr_busy && !ctxsw_active) {
 			nvgpu_log_fn(g, "done");
 			return 0;
 		}
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 4f7468b37..2596d4004 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -57,7 +57,6 @@
 #include <nvgpu/hw/gv11b/hw_fifo_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_proj_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
-#include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_ram_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_pbdma_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_perf_gv11b.h>
@@ -2050,7 +2049,6 @@ int gr_gv11b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 		       u32 expect_delay)
 {
 	u32 delay = expect_delay;
-	bool gr_enabled;
 	bool ctxsw_active;
 	bool gr_busy;
 	u32 gr_status;
@@ -2066,9 +2064,6 @@ int gr_gv11b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 		   only when gr_status is read */
 		gr_status = gk20a_readl(g, gr_status_r());
 
-		gr_enabled = gk20a_readl(g, mc_enable_r()) &
-			mc_enable_pgraph_enabled_f();
-
 		ctxsw_active = gr_status & 1<<7;
 
 		activity0 = gk20a_readl(g, gr_activity_0_r());
@@ -2081,7 +2076,7 @@ int gr_gv11b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 			    activity2 == 0 &&
 			    gr_activity_empty_or_preempted(activity4));
 
-		if (!gr_enabled || (!gr_busy && !ctxsw_active)) {
+		if (!gr_busy && !ctxsw_active) {
 			nvgpu_log_fn(g, "done");
 			return 0;
 		}