From 54c2ae59f0010c75bc03719e7b5ece4040c102d3 Mon Sep 17 00:00:00 2001 From: Leonid Moiseichuk Date: Tue, 11 Aug 2015 13:38:51 +0300 Subject: 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 Reviewed-on: http://git-master/r/781697 (cherry picked from commit bdd23136b182c933841f91dd2829061e278a46d4) Reviewed-on: http://git-master/r/793630 Reviewed-by: Konsta Holtta Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') 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) return 0; } +static void gr_gk20a_init_cyclestats(struct gk20a *g) +{ +#if defined(CONFIG_GK20A_CYCLE_STATS) + g->gpu_characteristics.flags |= + NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; +#else + (void)g; +#endif +} + void gk20a_init_gr_ops(struct gpu_ops *gops) { gops->gr.access_smpc_reg = gr_gk20a_access_smpc_reg; @@ -7383,4 +7393,5 @@ void gk20a_init_gr_ops(struct gpu_ops *gops) gops->gr.get_rop_l2_en_mask = gr_gk20a_rop_l2_en_mask; gops->gr.init_sm_dsm_reg_info = gr_gk20a_init_sm_dsm_reg_info; gops->gr.wait_empty = gr_gk20a_wait_idle; + gops->gr.init_cyclestats = gr_gk20a_init_cyclestats; } -- cgit v1.2.2