4 files changed, 16 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index d8687a37..ec4597a8 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -302,6 +302,7 @@ struct gpu_ops {
                                 u32 graphics_preempt_mode,
                                 u32 compute_preempt_mode);
                 int (*fuse_override)(struct gk20a *g);
+                void (*init_sm_id_table)(struct gk20a *g);
                 int (*load_smid_config)(struct gk20a *g);
                 void (*program_sm_id_numbering)(struct gk20a *g,
                                                 u32 gpc, u32 tpc, u32 smid);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 84b0ed6e..41ef5424 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1293,7 +1293,7 @@ static void gr_gk20a_program_active_tpc_counts(struct gk20a *g, u32 gpc_index)
                 gr_gpc0_gpm_sd_active_tpcs_num_f(gr->gpc_tpc_count[gpc_index]));
 }
 
-static void gr_gk20a_init_sm_id_table(struct gk20a *g)
+void gr_gk20a_init_sm_id_table(struct gk20a *g)
 {
         u32 gpc, tpc;
         u32 sm_id = 0;
@@ -1304,6 +1304,9 @@ static void gr_gk20a_init_sm_id_table(struct gk20a *g)
                         if (tpc < g->gr.gpc_tpc_count[gpc]) {
                                 g->gr.sm_to_cluster[sm_id].tpc_index = tpc;
                                 g->gr.sm_to_cluster[sm_id].gpc_index = gpc;
+                                g->gr.sm_to_cluster[sm_id].sm_index = 0;
+                                g->gr.sm_to_cluster[sm_id].global_tpc_index =
+                                                                        sm_id;
                                 sm_id++;
                         }
                 }
@@ -1339,9 +1342,10 @@ int gr_gk20a_init_fs_state(struct gk20a *g)
 
         gk20a_dbg_fn("");
 
-        gr_gk20a_init_sm_id_table(g);
+        if (g->ops.gr.init_sm_id_table)
+                g->ops.gr.init_sm_id_table(g);
 
-        for (sm_id = 0; sm_id < gr->tpc_count; sm_id++) {
+        for (sm_id = 0; sm_id < g->gr.no_of_sm; sm_id++) {
                 tpc_index = g->gr.sm_to_cluster[sm_id].tpc_index;
                 gpc_index = g->gr.sm_to_cluster[sm_id].gpc_index;
 
@@ -9112,6 +9116,7 @@ void gk20a_init_gr_ops(struct gpu_ops *gops)
         gops->gr.get_preemption_mode_flags = gr_gk20a_get_preemption_mode_flags;
         gops->gr.program_active_tpc_counts = gr_gk20a_program_active_tpc_counts;
         gops->gr.program_sm_id_numbering = gr_gk20a_program_sm_id_numbering;
+        gops->gr.init_sm_id_table = gr_gk20a_init_sm_id_table;
         gops->gr.is_ltcs_ltss_addr = gr_gk20a_is_ltcs_ltss_addr_stub;
         gops->gr.is_ltcn_ltss_addr = gr_gk20a_is_ltcn_ltss_addr_stub;
         gops->gr.split_lts_broadcast_addr =
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index e20207c5..1b7bc252 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -174,8 +174,10 @@ struct zbc_query_params {
 };
 
 struct sm_info {
-        u8 gpc_index;
-        u8 tpc_index;
+        u32 gpc_index;
+        u32 tpc_index;
+        u32 sm_index;
+        u32 global_tpc_index;
 };
 
 #if defined(CONFIG_GK20A_CYCLE_STATS)
@@ -662,6 +664,8 @@ void gk20a_gr_enable_gpc_exceptions(struct gk20a *g);
 int gr_gk20a_commit_global_timeslice(struct gk20a *g,
                                         struct channel_gk20a *c, bool patch);
 
+void gr_gk20a_init_sm_id_table(struct gk20a *g);
+
 static inline const char *gr_gk20a_graphics_preempt_mode_name(u32 graphics_preempt_mode)
 {
         switch (graphics_preempt_mode) {
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 44a1c2c7..7903af79 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -1561,6 +1561,7 @@ void gm20b_init_gr(struct gpu_ops *gops)
         gops->gr.suspend_contexts = gr_gk20a_suspend_contexts;
         gops->gr.get_preemption_mode_flags = gr_gm20b_get_preemption_mode_flags;
         gops->gr.fuse_override = gm20b_gr_fuse_override;
+        gops->gr.init_sm_id_table = gr_gk20a_init_sm_id_table;
         gops->gr.load_smid_config = gr_gm20b_load_smid_config;
         gops->gr.program_sm_id_numbering = gr_gm20b_program_sm_id_numbering;
         gops->gr.is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr;