diff options
author | Peter Daifuku <pdaifuku@nvidia.com> | 2017-11-08 22:13:29 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-13 21:19:20 -0500 |
commit | c9419732776a3f31b3c1ace0cd113151f3a4d7cd (patch) | |
tree | ffe4252f735d75d46bed02ee9f61fbbd11677e4d /drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |
parent | c0a461dbbccf56681ff531e7e4c8f5fb01c3e2cf (diff) |
gpu: nvgpu: ctx_patch_write fixes
- Add update_patch_count parameter to ctx_patch_write_begin/end functions
If True, the main_image_patch_count register will be updated. Previously,
the patch count would be updated if the cpu_va for the graphics context
was non-NULL, but this only works for sysmem (cpu_va is always 0 for vidmem)
- Remove unused patch parameter for the commit_global_timeslice functions
JIRA ESRM-74
Bug 2012077
Change-Id: I35d0a9eb48669a227833bba1d2e63e9fe8fd8aa9
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1594790
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/gr_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 4c49f734..c692d975 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -1339,7 +1339,7 @@ int gm20b_gr_update_sm_error_state(struct gk20a *g, | |||
1339 | gk20a_writel(g, gr_gpcs_tpcs_sm_hww_warp_esr_report_mask_r() + offset, | 1339 | gk20a_writel(g, gr_gpcs_tpcs_sm_hww_warp_esr_report_mask_r() + offset, |
1340 | gr->sm_error_states[sm_id].hww_warp_esr_report_mask); | 1340 | gr->sm_error_states[sm_id].hww_warp_esr_report_mask); |
1341 | } else { | 1341 | } else { |
1342 | err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx); | 1342 | err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx, false); |
1343 | if (err) | 1343 | if (err) |
1344 | goto enable_ctxsw; | 1344 | goto enable_ctxsw; |
1345 | 1345 | ||
@@ -1352,7 +1352,7 @@ int gm20b_gr_update_sm_error_state(struct gk20a *g, | |||
1352 | gr->sm_error_states[sm_id].hww_warp_esr_report_mask, | 1352 | gr->sm_error_states[sm_id].hww_warp_esr_report_mask, |
1353 | true); | 1353 | true); |
1354 | 1354 | ||
1355 | gr_gk20a_ctx_patch_write_end(g, ch_ctx); | 1355 | gr_gk20a_ctx_patch_write_end(g, ch_ctx, false); |
1356 | } | 1356 | } |
1357 | 1357 | ||
1358 | enable_ctxsw: | 1358 | enable_ctxsw: |