gpu: nvgpu: vgpu: get virtual SMs mapping

On gv11b we can have multiple SMs per TPC. Add sm_per_tpc in
vgpu constants to properly dimension the virtual SM to TPC/GPC
mapping in virtualization case.
Use TEGRA_VGPU_CMD_GET_SMS_MAPPING to query current mapping.

Bug 2039676

Change-Id: I817be18f9a28cfb9bd8af207d7d6341a2ec3994b
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1631203
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 5 insertions, 27 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.c
index 260ce080..fc39b3f5 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -40,24 +40,3 @@ void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g)
 #endif
 }
 
-int vgpu_gm20b_init_fs_state(struct gk20a *g)
-{
-        struct gr_gk20a *gr = &g->gr;
-        u32 tpc_index, gpc_index;
-        u32 sm_id = 0;
-
-        gk20a_dbg_fn("");
-
-        for (gpc_index = 0; gpc_index < gr->gpc_count; gpc_index++) {
-                for (tpc_index = 0; tpc_index < gr->gpc_tpc_count[gpc_index];
-                                                                tpc_index++) {
-                        g->gr.sm_to_cluster[sm_id].tpc_index = tpc_index;
-                        g->gr.sm_to_cluster[sm_id].gpc_index = gpc_index;
-
-                        sm_id++;
-                }
-        }
-
-        gr->no_of_sm = sm_id;
-        return 0;
-}
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.h b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.h
index f17de450..77b83cbe 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_gr_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -20,6 +20,5 @@
 #include "gk20a/gk20a.h"
 
 void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g);
-int vgpu_gm20b_init_fs_state(struct gk20a *g);
 
 #endif
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c
index 74fa65f3..eeeccf62 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -92,7 +92,7 @@ static const struct gpu_ops vgpu_gm20b_ops = {
                 .is_valid_compute_class = gr_gm20b_is_valid_compute_class,
                 .get_sm_dsm_perf_regs = gr_gm20b_get_sm_dsm_perf_regs,
                 .get_sm_dsm_perf_ctrl_regs = gr_gm20b_get_sm_dsm_perf_ctrl_regs,
-                .init_fs_state = vgpu_gm20b_init_fs_state,
+                .init_fs_state = vgpu_gr_init_fs_state,
                 .set_hww_esr_report_mask = gr_gm20b_set_hww_esr_report_mask,
                 .falcon_load_ucode = gr_gm20b_load_ctxsw_ucode_segments,
                 .load_ctxsw_ucode = gr_gk20a_load_ctxsw_ucode,
@@ -145,7 +145,7 @@ static const struct gpu_ops vgpu_gm20b_ops = {
                 .suspend_contexts = vgpu_gr_suspend_contexts,
                 .resume_contexts = vgpu_gr_resume_contexts,
                 .get_preemption_mode_flags = gr_gm20b_get_preemption_mode_flags,
-                .init_sm_id_table = gr_gk20a_init_sm_id_table,
+                .init_sm_id_table = vgpu_gr_init_sm_id_table,
                 .load_smid_config = gr_gm20b_load_smid_config,
                 .program_sm_id_numbering = gr_gm20b_program_sm_id_numbering,
                 .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr,