summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorVijayakumar <vsubbu@nvidia.com>2014-10-01 08:19:41 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:11:36 -0400
commitf26a620ad4e1221105d84ca1f2029571b3b30af6 (patch)
treead9fd72ad857b4987c8ffed10b7792cda333abb4 /drivers/gpu
parente58fddb0d5ec611e606e6125070253219f2da13e (diff)
gpu: nvgpu: gm20b: support new pmu ucode revision
bug 200042729 Change-Id: Ic4b4fa4c25f4017a69355e7f03a3f25d4ce92cff Signed-off-by: Vijayakumar <vsubbu@nvidia.com> Reviewed-on: http://git-master/r/552554 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index c4872ab8..64b126f6 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -659,6 +659,7 @@ int gk20a_init_pmu(struct pmu_gk20a *pmu)
659 pmu->remove_support = gk20a_remove_pmu_support; 659 pmu->remove_support = gk20a_remove_pmu_support;
660 660
661 switch (pmu->desc->app_version) { 661 switch (pmu->desc->app_version) {
662 case APP_VERSION_GM20B_3:
662 case APP_VERSION_GM20B_2: 663 case APP_VERSION_GM20B_2:
663 g->ops.pmu_ver.get_perfmon_cntr_ptr = get_perfmon_cntr_ptr_v2; 664 g->ops.pmu_ver.get_perfmon_cntr_ptr = get_perfmon_cntr_ptr_v2;
664 g->ops.pmu_ver.set_perfmon_cntr_ut = set_perfmon_cntr_ut_v2; 665 g->ops.pmu_ver.set_perfmon_cntr_ut = set_perfmon_cntr_ut_v2;
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
index 81177f5c..048520f9 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
@@ -51,6 +51,7 @@
51/* Mapping between AP_CTRLs and Idle counters */ 51/* Mapping between AP_CTRLs and Idle counters */
52#define PMU_AP_IDLE_MASK_GRAPHICS (PMU_AP_IDLE_MASK_HIST_IDX_1) 52#define PMU_AP_IDLE_MASK_GRAPHICS (PMU_AP_IDLE_MASK_HIST_IDX_1)
53 53
54#define APP_VERSION_GM20B_3 18935575
54#define APP_VERSION_GM20B_2 18694072 55#define APP_VERSION_GM20B_2 18694072
55#define APP_VERSION_GM20B_1 18547257 56#define APP_VERSION_GM20B_1 18547257
56#define APP_VERSION_GM20B 17615280 57#define APP_VERSION_GM20B 17615280