diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-10 16:47:17 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-16 13:58:23 -0400 |
commit | c3117bf337371d6e161a13849cadc8a4fc9c63b0 (patch) | |
tree | 61fb2d6d31991d680024d0195b0a240daf4dde86 /drivers | |
parent | 6863c08cc6c2ea1badfe23a536f6bf08d5d5431a (diff) |
gpu: nvgpu: gv11b: Use gp10b GR floorsweeping
Use gp10b version of GR floorsweeping function.
Change-Id: I5715672b5f94b779165f44c78aec14a2836928e7
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1144905
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 64bfa773..cb9c1902 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, | |||
1310 | 1310 | ||
1311 | static int gr_gv11b_init_fs_state(struct gk20a *g) | 1311 | static int gr_gv11b_init_fs_state(struct gk20a *g) |
1312 | { | 1312 | { |
1313 | u32 data; | 1313 | return gr_gp10b_init_fs_state(g); |
1314 | |||
1315 | data = gk20a_readl(g, gr_gpcs_tpcs_sm_texio_control_r()); | ||
1316 | data = set_field(data, gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_m(), | ||
1317 | gr_gpcs_tpcs_sm_texio_control_oor_addr_check_mode_arm_63_48_match_f()); | ||
1318 | gk20a_writel(g, gr_gpcs_tpcs_sm_texio_control_r(), data); | ||
1319 | |||
1320 | data = gk20a_readl(g, gr_gpcs_tpcs_sm_disp_ctrl_r()); | ||
1321 | data = set_field(data, gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_m(), | ||
1322 | gr_gpcs_tpcs_sm_disp_ctrl_re_suppress_disable_f()); | ||
1323 | gk20a_writel(g, gr_gpcs_tpcs_sm_disp_ctrl_r(), data); | ||
1324 | |||
1325 | return gr_gm20b_ctx_state_floorsweep(g); | ||
1326 | } | 1314 | } |
1327 | 1315 | ||
1328 | static void gr_gv11b_init_cyclestats(struct gk20a *g) | 1316 | static void gr_gv11b_init_cyclestats(struct gk20a *g) |