From 4f47e368489c587be77539b799342c4803cdb651 Mon Sep 17 00:00:00 2001 From: Vinod G Date: Thu, 19 Sep 2019 11:24:17 -0700 Subject: [PATCH] gpu: nvgpu: fix misra 4.7 errors in gr unit Fix remaining misra 4.7 violations in gr unit misra_c_2012_directive_4_7_violation: returns error information is not being checked. Jira NVGPU-4054 Change-Id: Ia3051e6d55cad73523f2bf7f366c7eb58430c893 Signed-off-by: Vinod G Reviewed-on: https://git-master.nvidia.com/r/2201759 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/gr/gr.c | 13 ++++++++++--- .../gpu/nvgpu/hal/gr/config/gr_config_gv100_fusa.c | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c index fdfc525f6..e4aa349ae 100644 --- a/drivers/gpu/nvgpu/common/gr/gr.c +++ b/drivers/gpu/nvgpu/common/gr/gr.c @@ -363,12 +363,19 @@ static int gr_init_config(struct gk20a *g, struct nvgpu_gr *gr) static int nvgpu_gr_init_ctx_state(struct gk20a *g) { + int err = 0; + if (g->gr->golden_image != NULL && - nvgpu_gr_obj_ctx_is_golden_image_ready(g->gr->golden_image)) { - return 0; + nvgpu_gr_obj_ctx_is_golden_image_ready(g->gr->golden_image)) { + return err; } - return nvgpu_gr_falcon_init_ctx_state(g, g->gr->falcon); + err = nvgpu_gr_falcon_init_ctx_state(g, g->gr->falcon); + if (err != 0) { + nvgpu_err(g, "gr ctx_state init failed"); + } + + return err; } static int gr_init_ctx_and_map_zbc(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/hal/gr/config/gr_config_gv100_fusa.c b/drivers/gpu/nvgpu/hal/gr/config/gr_config_gv100_fusa.c index 8e891e000..0863a448b 100644 --- a/drivers/gpu/nvgpu/hal/gr/config/gr_config_gv100_fusa.c +++ b/drivers/gpu/nvgpu/hal/gr/config/gr_config_gv100_fusa.c @@ -247,7 +247,9 @@ static int gr_gv100_scg_estimate_perf(struct gk20a *g, err = gr_gv100_scg_calculate_perf(gr_config, scale_factor, scg_num_pes, num_tpc_gpc, max_tpc_gpc, min_scg_gpc_pix_perf, average_tpcs, perf); - + if (err != 0) { + nvgpu_err(g, "scg perf calculation failed"); + } free_resources: nvgpu_kfree(g, num_tpc_gpc); return err;