summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu
diff options
context:
space:
mode:
authorPeter Daifuku <pdaifuku@nvidia.com>2016-09-07 20:27:45 -0400
committerDeepak Nibade <dnibade@nvidia.com>2016-12-27 04:56:19 -0500
commita74a971f498084bf9131be3964c380c74e9d5960 (patch)
treea1b59b8c4c5fbff59a2b408ad979659dce3c24a4 /drivers/gpu/nvgpu
parent758add10abe564fb58ed928e0f5a8f1b4d31414f (diff)
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 <pdaifuku@nvidia.com> Reviewed-on: http://git-master/r/1216644 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r--drivers/gpu/nvgpu/gp106/hal_gp106.c4
-rw-r--r--drivers/gpu/nvgpu/gp10b/hal_gp10b.c4
2 files changed, 8 insertions, 0 deletions
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 @@
46#include "nvgpu_gpuid_t18x.h" 46#include "nvgpu_gpuid_t18x.h"
47#include "hw_proj_gp106.h" 47#include "hw_proj_gp106.h"
48#include "gk20a/dbg_gpu_gk20a.h" 48#include "gk20a/dbg_gpu_gk20a.h"
49#include "gk20a/css_gr_gk20a.h"
49 50
50static struct gpu_ops gp106_ops = { 51static struct gpu_ops gp106_ops = {
51 .clock_gating = { 52 .clock_gating = {
@@ -207,6 +208,9 @@ int gp106_init_hal(struct gk20a *g)
207 gp10b_init_regops(gops); 208 gp10b_init_regops(gops);
208 gp10b_init_cde_ops(gops); 209 gp10b_init_cde_ops(gops);
209 gk20a_init_tsg_ops(gops); 210 gk20a_init_tsg_ops(gops);
211#if defined(CONFIG_GK20A_CYCLE_STATS)
212 gk20a_init_css_ops(gops);
213#endif
210 gm206_init_bios(gops); 214 gm206_init_bios(gops);
211 gops->name = "gp10x"; 215 gops->name = "gp10x";
212 gops->get_litter_value = gp106_get_litter_value; 216 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 @@
44#include "gp10b.h" 44#include "gp10b.h"
45#include "hw_proj_gp10b.h" 45#include "hw_proj_gp10b.h"
46#include "gk20a/dbg_gpu_gk20a.h" 46#include "gk20a/dbg_gpu_gk20a.h"
47#include "gk20a/css_gr_gk20a.h"
47 48
48#define FUSE_OPT_PRIV_SEC_EN_0 0x264 49#define FUSE_OPT_PRIV_SEC_EN_0 0x264
49#define PRIV_SECURITY_ENABLED 0x01 50#define PRIV_SECURITY_ENABLED 0x01
@@ -242,6 +243,9 @@ int gp10b_init_hal(struct gk20a *g)
242 gp10b_init_cde_ops(gops); 243 gp10b_init_cde_ops(gops);
243 gp10b_init_therm_ops(gops); 244 gp10b_init_therm_ops(gops);
244 gk20a_init_tsg_ops(gops); 245 gk20a_init_tsg_ops(gops);
246#if defined(CONFIG_GK20A_CYCLE_STATS)
247 gk20a_init_css_ops(gops);
248#endif
245 gops->name = "gp10b"; 249 gops->name = "gp10b";
246 gops->chip_init_gpu_characteristics = gp10b_init_gpu_characteristics; 250 gops->chip_init_gpu_characteristics = gp10b_init_gpu_characteristics;
247 gops->get_litter_value = gp10b_get_litter_value; 251 gops->get_litter_value = gp10b_get_litter_value;