gpu: nvgpu: init_cyclestats fixes

- in the native case, replace calls for init_cyclestats with
  the gm20b version, as each chip had identical versions of the code.

- in the virtual case, use the vgpu version of the function in order
  to get the new max_css_buffer_size characteristic set to the mempool
  size.

JIRA ESRM-54
Bug 200296210

Change-Id: I475876cb392978fb1350ede58e37d0962ae095c3
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1578934
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

5 files changed, 3 insertions, 17 deletions

diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 1ae424df..e8be1a43 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -316,7 +316,7 @@ static const struct gpu_ops gv100_ops = {
                 .get_max_fbps_count = gr_gm20b_get_max_fbps_count,
                 .init_sm_dsm_reg_info = gv11b_gr_init_sm_dsm_reg_info,
                 .wait_empty = gr_gv11b_wait_empty,
-                .init_cyclestats = gr_gv11b_init_cyclestats,
+                .init_cyclestats = gr_gm20b_init_cyclestats,
                 .set_sm_debug_mode = gv11b_gr_set_sm_debug_mode,
                 .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs,
                 .bpt_reg_info = gv11b_gr_bpt_reg_info,
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index fc894908..59a04d2c 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -1684,19 +1684,6 @@ void gr_gv11b_commit_global_attrib_cb(struct gk20a *g,
                 gr_gpcs_tpcs_tex_rm_cb_1_valid_true_f(), patch);
 }
 
-
-void gr_gv11b_init_cyclestats(struct gk20a *g)
-{
-#if defined(CONFIG_GK20A_CYCLE_STATS)
-        g->gpu_characteristics.flags |=
-                NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS;
-        g->gpu_characteristics.flags |=
-                NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT;
-#else
-        (void)g;
-#endif
-}
-
 void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
index e469d142..71975e24 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
@@ -124,7 +124,6 @@ int gr_gv11b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 void gr_gv11b_commit_global_attrib_cb(struct gk20a *g,
                                              struct channel_ctx_gk20a *ch_ctx,
                                              u64 addr, bool patch);
-void gr_gv11b_init_cyclestats(struct gk20a *g);
 void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index);
 void gr_gv11b_get_access_map(struct gk20a *g,
                                    u32 **whitelist, int *num_entries);
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 8e4cdab8..400c2ad0 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -280,7 +280,7 @@ static const struct gpu_ops gv11b_ops = {
                 .get_max_fbps_count = gr_gm20b_get_max_fbps_count,
                 .init_sm_dsm_reg_info = gv11b_gr_init_sm_dsm_reg_info,
                 .wait_empty = gr_gv11b_wait_empty,
-                .init_cyclestats = gr_gv11b_init_cyclestats,
+                .init_cyclestats = gr_gm20b_init_cyclestats,
                 .set_sm_debug_mode = gv11b_gr_set_sm_debug_mode,
                 .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs,
                 .bpt_reg_info = gv11b_gr_bpt_reg_info,
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 7f6df820..80d0ae54 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -162,7 +162,7 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                 .get_max_fbps_count = vgpu_gr_get_max_fbps_count,
                 .init_sm_dsm_reg_info = gv11b_gr_init_sm_dsm_reg_info,
                 .wait_empty = gr_gv11b_wait_empty,
-                .init_cyclestats = gr_gv11b_init_cyclestats,
+                .init_cyclestats = vgpu_gr_gm20b_init_cyclestats,
                 .set_sm_debug_mode = vgpu_gr_set_sm_debug_mode,
                 .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs,
                 .bpt_reg_info = gv11b_gr_bpt_reg_info,