From 808af68d962b85594c2accd1069c6a2de35c50e4 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Tue, 16 May 2017 15:37:02 +0300 Subject: gpu: nvgpu: gv11b: check subctx header err codes React to possible errors in gr_gv11b_commit_inst() from allocating and updating subcontext header. Bug 1927306 Change-Id: I668e13ce13af296e9a7badb3b167fa7a7cd26212 Signed-off-by: Konsta Holtta Reviewed-on: http://git-master/r/1483043 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Seshendra Gadagottu Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 46626bb7..179c7d33 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c @@ -1436,12 +1436,17 @@ static int gr_gv11b_commit_inst(struct channel_gk20a *c, u64 gpu_va) u32 addr_lo; u32 addr_hi; struct ctx_header_desc *ctx; + int err; gk20a_dbg_fn(""); - gv11b_alloc_subctx_header(c); + err = gv11b_alloc_subctx_header(c); + if (err) + return err; - gv11b_update_subctx_header(c, gpu_va); + err = gv11b_update_subctx_header(c, gpu_va); + if (err) + return err; ctx = &c->ch_ctx.ctx_header; addr_lo = u64_lo32(ctx->mem.gpu_va) >> ram_in_base_shift_v(); -- cgit v1.2.2