nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: fix patch write error check in update_ctxsw_preemption_mode

Browse Source 
Don't attempt to access memory if the patch context can't be mapped, but
print an error message instead.

Change-Id: I2d0ec22378ace0ef826f5a84a9ce4d35466f7832
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1157281
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Konsta Holtta
2016-05-25 13:24:37 +03:00
committed by Terje Bergstrom
parent 4dd4587f17
commit 822b0dc538
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/gv11b/gr_gv11b.c
View File

@@ -998,6 +998,11 @@ static void gr_gv11b_update_ctxsw_preemption_mode(struct gk20a *g,
gr_ctx->t18x.preempt_ctxsw_buffer.gpu_va >> 8); gr_ctx->t18x.preempt_ctxsw_buffer.gpu_va >> 8);
err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx); err = gr_gk20a_ctx_patch_write_begin(g, ch_ctx);
if (err) {
gk20a_err(dev_from_gk20a(g),
"can't map patch context");
goto out;
}
addr = (u64_lo32(gr_ctx->t18x.betacb_ctxsw_buffer.gpu_va) >> addr = (u64_lo32(gr_ctx->t18x.betacb_ctxsw_buffer.gpu_va) >>
gr_gpcs_setup_attrib_cb_base_addr_39_12_align_bits_v()) | gr_gpcs_setup_attrib_cb_base_addr_39_12_align_bits_v()) |
@@ -1049,6 +1054,7 @@ static void gr_gv11b_update_ctxsw_preemption_mode(struct gk20a *g,
gr_gk20a_ctx_patch_write_end(g, ch_ctx); gr_gk20a_ctx_patch_write_end(g, ch_ctx);
} }
out:
gk20a_dbg_fn("done"); gk20a_dbg_fn("done");
} }