diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index bba7e66ce..54f0d2d84 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -126,20 +126,6 @@ void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr)
 
 void gv11b_fb_reset(struct gk20a *g)
 {
-	if (nvgpu_is_bpmp_running(g) && (!nvgpu_platform_is_simulation(g))) {
-		nvgpu_log(g, gpu_dbg_info, "mc_elpg_enable set by bpmp");
-	} else {
-		u32 mc_elpg_enable_val;
-
-		nvgpu_log(g, gpu_dbg_info, "enable xbar, pfb and hub");
-		mc_elpg_enable_val = mc_elpg_enable_xbar_enabled_f() |
-					mc_elpg_enable_pfb_enabled_f() |
-					mc_elpg_enable_hub_enabled_f();
-		mc_elpg_enable_val |= gk20a_readl(g, mc_elpg_enable_r());
-		gk20a_writel(g, mc_elpg_enable_r(), mc_elpg_enable_val);
-
-	}
-	/* fs hub should be out of reset by now */
 	gv11b_init_nvlink_soc_credits(g);
 }
 
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index 9f9ff3371..96844ebdb 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -58,13 +58,6 @@ void gv11b_ltc_init_fs_state(struct gk20a *g)
 
 	nvgpu_log_info(g, "initialize gv11b l2");
 
-	g->ops.mc.reset(g, mc_enable_pfb_enabled_f() |
-				mc_enable_l2_enabled_f());
-
-	reg = gk20a_readl(g, mc_elpg_enable_r());
-	reg |= mc_elpg_enable_l2_enabled_f();
-	gk20a_writel(g, mc_elpg_enable_r(), reg);
-
 	g->max_ltc_count = gk20a_readl(g, top_num_ltcs_r());
 	g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r());
 	nvgpu_log_info(g, "%u ltcs out of %u", g->ltc_count, g->max_ltc_count);