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/gk20a.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 7875d621..c0889571 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -1965,20 +1965,13 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) gk20a_platform_has_syncpoints(g->dev)) gpu->flags |= NVGPU_GPU_FLAGS_HAS_SYNCPOINTS; - if (IS_ENABLED(CONFIG_GK20A_CYCLE_STATS)) { - gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; - /* the snapshots must be supported only for t210 */ - if (NVGPU_GPU_ARCH_GM200 == gpu->arch && - NVGPU_GPU_IMPL_GM20B == gpu->impl) { - gpu->flags |= - NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT; - } - } - gpu->gpc_mask = 1; g->ops.gr.detect_sm_arch(g); + if (g->ops.gr.init_cyclestats) + g->ops.gr.init_cyclestats(g); + gpu->gpu_ioctl_nr_last = NVGPU_GPU_IOCTL_LAST; gpu->tsg_ioctl_nr_last = NVGPU_TSG_IOCTL_LAST; gpu->dbg_gpu_ioctl_nr_last = NVGPU_DBG_GPU_IOCTL_LAST; -- cgit v1.2.2