summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSeshendra Gadagottu <sgadagottu@nvidia.com>2014-06-03 15:34:32 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:10:04 -0400
commit4e9030f34d3018a2ca6319985f9036c438eb82f4 (patch)
tree5859741c8421350de5dae470d7a3b107d8e5e51f /drivers
parent7d917f43a5a8abc41988e606ef5e7311dcf23ff8 (diff)
gpu: nvgpu: update gpmu supported versions
Updated gmpu ucode versions supported for gm20b. Bug 1514021 Change-Id: If9cbde60449f5cc2b9c39c36ab5c79985d320bf8 Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-on: http://git-master/r/418479 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c4
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 4af23e3d..bccd4100 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -487,6 +487,7 @@ static int gk20a_init_pmu(struct pmu_gk20a *pmu)
487 struct gk20a *g = pmu->g; 487 struct gk20a *g = pmu->g;
488 switch (pmu->desc->app_version) { 488 switch (pmu->desc->app_version) {
489 case APP_VERSION_1: 489 case APP_VERSION_1:
490 case APP_VERSION_2:
490 g->ops.pmu_ver.cmd_id_zbc_table_update = 16; 491 g->ops.pmu_ver.cmd_id_zbc_table_update = 16;
491 g->ops.pmu_ver.get_pmu_cmdline_args_size = 492 g->ops.pmu_ver.get_pmu_cmdline_args_size =
492 pmu_cmdline_size_v1; 493 pmu_cmdline_size_v1;
@@ -618,7 +619,8 @@ static int gk20a_init_pmu(struct pmu_gk20a *pmu)
618 break; 619 break;
619 default: 620 default:
620 gk20a_err(dev_from_gk20a(pmu->g), 621 gk20a_err(dev_from_gk20a(pmu->g),
621 "PMU code version not supported\n"); 622 "PMU code version not supported version: %d\n",
623 pmu->desc->app_version);
622 return -EINVAL; 624 return -EINVAL;
623 break; 625 break;
624 } 626 }
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
index 73a09db6..8aaea33f 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_2 18542378
54#define APP_VERSION_1 17997577 55#define APP_VERSION_1 17997577
55#define APP_VERSION_0 16856675 56#define APP_VERSION_0 16856675
56 57