diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 49ba21e0c..de6023b57 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -999,9 +999,6 @@ static int gr_gp10b_init_fs_state(struct gk20a *g)
 			 gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_disable_f());
 	gk20a_writel(g, gr_gpcs_tpcs_sm_disp_ctrl_r(), data);
 
-	/* disable deep binning */
-	gk20a_writel(g, gr_fe_go_idle_timeout_r(), 0x800);
-
 	return gr_gm20b_ctx_state_floorsweep(g);
 }
 
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
index 0aa68fa25..347e530d9 100644
--- a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
@@ -538,6 +538,10 @@ static inline u32 gr_fe_go_idle_timeout_count_disabled_f(void)
 {
 	return 0x0;
 }
+static inline u32 gr_fe_go_idle_timeout_count_prod_f(void)
+{
+	return 0x7fffffff;
+}
 static inline u32 gr_fe_object_table_r(u32 i)
 {
 	return 0x00404200 + i*4;