gpu: nvgpu: handle smid table init failures

Handle the possibility of failing gr init due to smid table initialization
failures

bug 2004378

Change-Id: I904b918a0ea31c32292edb3ab8ac3b1459c38a28
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1581661
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 92096cfa..af834b02 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -658,9 +658,13 @@ int gr_gm20b_load_smid_config(struct gk20a *g)
 
 int gr_gm20b_init_fs_state(struct gk20a *g)
 {
+        int err = 0;
+
         gk20a_dbg_fn("");
 
-        gr_gk20a_init_fs_state(g);
+        err = gr_gk20a_init_fs_state(g);
+        if (err)
+                return err;
 
         g->ops.gr.load_tpc_mask(g);
 
@@ -675,7 +679,7 @@ int gr_gm20b_init_fs_state(struct gk20a *g)
 
         g->ops.gr.load_smid_config(g);
 
-        return 0;
+        return err;
 }
 
 int gr_gm20b_load_ctxsw_ucode_segments(struct gk20a *g, u64 addr_base,