From d85aa0064b3e9e1de3f2583499963977286b0d25 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Wed, 17 May 2017 13:51:41 +0300 Subject: gpu: nvgpu: check commit_inst err codes gr_gk20a_init_golden_ctx_image() didn't check for error codes from gr.commit_inst(). Add the missing checks. Change-Id: I9f8449b2741c5a69cf65ad8191e9bc74c6ad1393 Signed-off-by: Konsta Holtta Reviewed-on: http://git-master/r/1483867 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 7bbac8cc..3486076e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -1785,7 +1785,9 @@ restore_fe_go_idle: g->ops.gr.write_zcull_ptr(g, gold_mem, 0); nvgpu_mem_end(g, ctxheader); - g->ops.gr.commit_inst(c, ch_ctx->global_ctx_buffer_va[GOLDEN_CTX_VA]); + err = g->ops.gr.commit_inst(c, ch_ctx->global_ctx_buffer_va[GOLDEN_CTX_VA]); + if (err) + goto clean_up; gr_gk20a_fecs_ctx_image_save(c, gr_fecs_method_push_adr_wfi_golden_save_v()); @@ -1813,7 +1815,9 @@ restore_fe_go_idle: } nvgpu_mem_end(g, ctxheader); - g->ops.gr.commit_inst(c, gr_mem->gpu_va); + err = g->ops.gr.commit_inst(c, gr_mem->gpu_va); + if (err) + goto clean_up; gr->ctx_vars.golden_image_initialized = true; -- cgit v1.2.2