diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index 3b3d775ed..7698d9680 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -135,14 +135,12 @@ static void gv11b_fb_reset(struct gk20a *g)
 	nvgpu_info(g, "reset gv11b fb");
 
 	g->ops.mc.reset(g, mc_enable_pfb_enabled_f() |
-				mc_enable_l2_enabled_f() |
 				mc_enable_xbar_enabled_f() |
 				mc_enable_hub_enabled_f());
 
 	val = gk20a_readl(g, mc_elpg_enable_r());
 	val |= mc_elpg_enable_xbar_enabled_f() |
 		mc_elpg_enable_pfb_enabled_f() |
-		mc_elpg_enable_l2_enabled_f() |
 		mc_elpg_enable_hub_enabled_f();
 	gk20a_writel(g, mc_elpg_enable_r(), val);
 
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index 5b98b0aa7..389863825 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -22,6 +22,7 @@
 #include <nvgpu/hw/gv11b/hw_ltc_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_top_gv11b.h>
+#include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_pri_ringmaster_gv11b.h>
 
 /*
@@ -49,6 +50,13 @@ static void gv11b_ltc_init_fs_state(struct gk20a *g)
 
 	gk20a_dbg_info("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());
 	gk20a_dbg_info("%u ltcs out of %u", g->ltc_count, g->max_ltc_count);