From a74a971f498084bf9131be3964c380c74e9d5960 Mon Sep 17 00:00:00 2001 From: Peter Daifuku Date: Wed, 7 Sep 2016 17:27:45 -0700 Subject: gpu: nvgpu: vgpu: cyclestat snapshot support Add support for cyclestats snapshots in the virtual case Bug 1700143 JIRA EVLR-278 Change-Id: I353efac6a17704c815a99745ac04d2c3d831351b Signed-off-by: Peter Daifuku Reviewed-on: http://git-master/r/1216644 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp106/hal_gp106.c | 4 ++++ drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 0423dcfc..eadeb1b4 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -46,6 +46,7 @@ #include "nvgpu_gpuid_t18x.h" #include "hw_proj_gp106.h" #include "gk20a/dbg_gpu_gk20a.h" +#include "gk20a/css_gr_gk20a.h" static struct gpu_ops gp106_ops = { .clock_gating = { @@ -207,6 +208,9 @@ int gp106_init_hal(struct gk20a *g) gp10b_init_regops(gops); gp10b_init_cde_ops(gops); gk20a_init_tsg_ops(gops); +#if defined(CONFIG_GK20A_CYCLE_STATS) + gk20a_init_css_ops(gops); +#endif gm206_init_bios(gops); gops->name = "gp10x"; gops->get_litter_value = gp106_get_litter_value; diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index ae92608c..ec81cf35 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -44,6 +44,7 @@ #include "gp10b.h" #include "hw_proj_gp10b.h" #include "gk20a/dbg_gpu_gk20a.h" +#include "gk20a/css_gr_gk20a.h" #define FUSE_OPT_PRIV_SEC_EN_0 0x264 #define PRIV_SECURITY_ENABLED 0x01 @@ -242,6 +243,9 @@ int gp10b_init_hal(struct gk20a *g) gp10b_init_cde_ops(gops); gp10b_init_therm_ops(gops); gk20a_init_tsg_ops(gops); +#if defined(CONFIG_GK20A_CYCLE_STATS) + gk20a_init_css_ops(gops); +#endif gops->name = "gp10b"; gops->chip_init_gpu_characteristics = gp10b_init_gpu_characteristics; gops->get_litter_value = gp10b_get_litter_value; -- cgit v1.2.2