diff options
author | Peter Daifuku <pdaifuku@nvidia.com> | 2017-10-13 20:15:46 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-25 23:24:16 -0400 |
commit | 1cbb5ea0235f15180b1d4299499cab85db23c5ce (patch) | |
tree | 18fbd95dc57ee2d843df1e50efcedd8b6905584f /drivers/gpu/nvgpu/gv11b | |
parent | 914ded175c7e0517f506cb8ba03807227b88866f (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 13 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 |
3 files changed, 1 insertions, 15 deletions
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, | |||
1684 | gr_gpcs_tpcs_tex_rm_cb_1_valid_true_f(), patch); | 1684 | gr_gpcs_tpcs_tex_rm_cb_1_valid_true_f(), patch); |
1685 | } | 1685 | } |
1686 | 1686 | ||
1687 | |||
1688 | void gr_gv11b_init_cyclestats(struct gk20a *g) | ||
1689 | { | ||
1690 | #if defined(CONFIG_GK20A_CYCLE_STATS) | ||
1691 | g->gpu_characteristics.flags |= | ||
1692 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; | ||
1693 | g->gpu_characteristics.flags |= | ||
1694 | NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT; | ||
1695 | #else | ||
1696 | (void)g; | ||
1697 | #endif | ||
1698 | } | ||
1699 | |||
1700 | void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index) | 1687 | void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index) |
1701 | { | 1688 | { |
1702 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) | 1689 | #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, | |||
124 | void gr_gv11b_commit_global_attrib_cb(struct gk20a *g, | 124 | void gr_gv11b_commit_global_attrib_cb(struct gk20a *g, |
125 | struct channel_ctx_gk20a *ch_ctx, | 125 | struct channel_ctx_gk20a *ch_ctx, |
126 | u64 addr, bool patch); | 126 | u64 addr, bool patch); |
127 | void gr_gv11b_init_cyclestats(struct gk20a *g); | ||
128 | void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index); | 127 | void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index); |
129 | void gr_gv11b_get_access_map(struct gk20a *g, | 128 | void gr_gv11b_get_access_map(struct gk20a *g, |
130 | u32 **whitelist, int *num_entries); | 129 | 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 = { | |||
280 | .get_max_fbps_count = gr_gm20b_get_max_fbps_count, | 280 | .get_max_fbps_count = gr_gm20b_get_max_fbps_count, |
281 | .init_sm_dsm_reg_info = gv11b_gr_init_sm_dsm_reg_info, | 281 | .init_sm_dsm_reg_info = gv11b_gr_init_sm_dsm_reg_info, |
282 | .wait_empty = gr_gv11b_wait_empty, | 282 | .wait_empty = gr_gv11b_wait_empty, |
283 | .init_cyclestats = gr_gv11b_init_cyclestats, | 283 | .init_cyclestats = gr_gm20b_init_cyclestats, |
284 | .set_sm_debug_mode = gv11b_gr_set_sm_debug_mode, | 284 | .set_sm_debug_mode = gv11b_gr_set_sm_debug_mode, |
285 | .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs, | 285 | .enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs, |
286 | .bpt_reg_info = gv11b_gr_bpt_reg_info, | 286 | .bpt_reg_info = gv11b_gr_bpt_reg_info, |