summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
diff options
context:
space:
mode:
authorLeonid Moiseichuk <lmoiseichuk@nvidia.com>2015-08-11 06:38:51 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2015-09-04 12:03:07 -0400
commit54c2ae59f0010c75bc03719e7b5ece4040c102d3 (patch)
tree549ea910d4de7dde2d335e3f0198baab51354177 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c
parenteeb604c23d4ea7a6a7900b99a2ae92cff0488112 (diff)
gpu: nvgpu: cyclestats snapshot permissions rework
Cyclestats snapshot feature is expected for new devices. The detection code was isolated in separate function and run-time check added to validate/allow ioctl calls on the current GPU. Bug 1674079 Change-Id: Icc2f1e5cc50d39b395d31d5292c314f99d67f3eb Signed-off-by: Leonid Moiseichuk <lmoiseichuk@nvidia.com> Reviewed-on: http://git-master/r/781697 (cherry picked from commit bdd23136b182c933841f91dd2829061e278a46d4) Reviewed-on: http://git-master/r/793630 Reviewed-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index c36f2551..512a7d6b 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -7333,6 +7333,16 @@ int gr_gk20a_debugfs_init(struct gk20a *g)
7333 return 0; 7333 return 0;
7334} 7334}
7335 7335
7336static void gr_gk20a_init_cyclestats(struct gk20a *g)
7337{
7338#if defined(CONFIG_GK20A_CYCLE_STATS)
7339 g->gpu_characteristics.flags |=
7340 NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS;
7341#else
7342 (void)g;
7343#endif
7344}
7345
7336void gk20a_init_gr_ops(struct gpu_ops *gops) 7346void gk20a_init_gr_ops(struct gpu_ops *gops)
7337{ 7347{
7338 gops->gr.access_smpc_reg = gr_gk20a_access_smpc_reg; 7348 gops->gr.access_smpc_reg = gr_gk20a_access_smpc_reg;
@@ -7383,4 +7393,5 @@ void gk20a_init_gr_ops(struct gpu_ops *gops)
7383 gops->gr.get_rop_l2_en_mask = gr_gk20a_rop_l2_en_mask; 7393 gops->gr.get_rop_l2_en_mask = gr_gk20a_rop_l2_en_mask;
7384 gops->gr.init_sm_dsm_reg_info = gr_gk20a_init_sm_dsm_reg_info; 7394 gops->gr.init_sm_dsm_reg_info = gr_gk20a_init_sm_dsm_reg_info;
7385 gops->gr.wait_empty = gr_gk20a_wait_idle; 7395 gops->gr.wait_empty = gr_gk20a_wait_idle;
7396 gops->gr.init_cyclestats = gr_gk20a_init_cyclestats;
7386} 7397}