diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2016-05-25 06:23:52 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:16 -0500 |
commit | 8403bb63000fd9aa35a43fcddc82de2760ad0ac3 (patch) | |
tree | 3d7ab7069247c45b889288f4ae4fa09b0e19d4f1 /drivers/gpu/nvgpu | |
parent | 11e9ba82de18ba3be7701f36628a9f70ebbe1b39 (diff) |
gpu: nvgpu: map patch ctx in set_preemption_mode
The per-write map/unmap feature from gr_gk20a_ctx_patch_write_begin() is
dropped, so call begin/end explicitly from gr_gp10b_set_preemption_mode
for the commit_global_cb_manager call.
Change-Id: I7bf952fffb54d4f18706e77dea015ffe4b68bcfe
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1157835
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 4a8a1d8e..339f0413 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -2077,7 +2077,15 @@ static int gr_gp10b_set_preemption_mode(struct channel_gk20a *ch, | |||
2077 | 2077 | ||
2078 | if (g->ops.gr.update_ctxsw_preemption_mode) { | 2078 | if (g->ops.gr.update_ctxsw_preemption_mode) { |
2079 | g->ops.gr.update_ctxsw_preemption_mode(ch->g, ch_ctx, mem); | 2079 | g->ops.gr.update_ctxsw_preemption_mode(ch->g, ch_ctx, mem); |
2080 | |||
2081 | err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx); | ||
2082 | if (err) { | ||
2083 | gk20a_err(dev_from_gk20a(g), | ||
2084 | "can't map patch context"); | ||
2085 | goto enable_ch; | ||
2086 | } | ||
2080 | g->ops.gr.commit_global_cb_manager(g, ch, true); | 2087 | g->ops.gr.commit_global_cb_manager(g, ch, true); |
2088 | gr_gk20a_ctx_patch_write_end(g, ch_ctx); | ||
2081 | } | 2089 | } |
2082 | 2090 | ||
2083 | enable_ch: | 2091 | enable_ch: |