summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2015-10-07 17:52:55 -0400
committerDeepak Nibade <dnibade@nvidia.com>2016-12-27 04:52:08 -0500
commit2643f200cfdb655e5ee00fa406c0dea534859df3 (patch)
treedee41807e26f310956eccf6996063638a6192a69 /drivers/gpu/nvgpu/gp10b
parent35b5e65166529f68f306c8ac7ae64dd938b8e8c0 (diff)
gpu: nvgpu: gp10b: Use PROD value for FE_GO_IDLE_TIMEOUT
Add gp10b PROD value for FE_GO_IDLE_TIMEOUT. Use the PROD value written in gk20a_init_gr_setup_hw() instead of hard coding here. Change-Id: If3bd981c1c0d9cc8ad19c21c220b7de81fdb529e Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/813959
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r--drivers/gpu/nvgpu/gp10b/gr_gp10b.c3
-rw-r--r--drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 49ba21e0..de6023b5 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)
999 gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_disable_f()); 999 gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_disable_f());
1000 gk20a_writel(g, gr_gpcs_tpcs_sm_disp_ctrl_r(), data); 1000 gk20a_writel(g, gr_gpcs_tpcs_sm_disp_ctrl_r(), data);
1001 1001
1002 /* disable deep binning */
1003 gk20a_writel(g, gr_fe_go_idle_timeout_r(), 0x800);
1004
1005 return gr_gm20b_ctx_state_floorsweep(g); 1002 return gr_gm20b_ctx_state_floorsweep(g);
1006} 1003}
1007 1004
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h
index 0aa68fa2..347e530d 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)
538{ 538{
539 return 0x0; 539 return 0x0;
540} 540}
541static inline u32 gr_fe_go_idle_timeout_count_prod_f(void)
542{
543 return 0x7fffffff;
544}
541static inline u32 gr_fe_object_table_r(u32 i) 545static inline u32 gr_fe_object_table_r(u32 i)
542{ 546{
543 return 0x00404200 + i*4; 547 return 0x00404200 + i*4;