diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 64bfa7734..cb9c19027 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -1310,19 +1310,7 @@ static void gr_gv11b_commit_global_bundle_cb(struct gk20a *g,
 
 static int gr_gv11b_init_fs_state(struct gk20a *g)
 {
-	u32 data;
-
-	data = gk20a_readl(g, gr_gpcs_tpcs_sm_texio_control_r());
-	data = set_field(data, gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_m(),
-			gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_arm_63_48_match_f());
-	gk20a_writel(g, gr_gpcs_tpcs_sm_texio_control_r(), data);
-
-	data = gk20a_readl(g, gr_gpcs_tpcs_sm_disp_ctrl_r());
-	data = set_field(data, gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_m(),
-			 gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_disable_f());
-	gk20a_writel(g, gr_gpcs_tpcs_sm_disp_ctrl_r(), data);
-
-	return gr_gm20b_ctx_state_floorsweep(g);
+	return gr_gp10b_init_fs_state(g);
 }
 
 static void gr_gv11b_init_cyclestats(struct gk20a *g)