From 4e9030f34d3018a2ca6319985f9036c438eb82f4 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Tue, 3 Jun 2014 12:34:32 -0700 Subject: gpu: nvgpu: update gpmu supported versions Updated gmpu ucode versions supported for gm20b. Bug 1514021 Change-Id: If9cbde60449f5cc2b9c39c36ab5c79985d320bf8 Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/418479 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 4 +++- drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers') 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) struct gk20a *g = pmu->g; switch (pmu->desc->app_version) { case APP_VERSION_1: + case APP_VERSION_2: g->ops.pmu_ver.cmd_id_zbc_table_update = 16; g->ops.pmu_ver.get_pmu_cmdline_args_size = pmu_cmdline_size_v1; @@ -618,7 +619,8 @@ static int gk20a_init_pmu(struct pmu_gk20a *pmu) break; default: gk20a_err(dev_from_gk20a(pmu->g), - "PMU code version not supported\n"); + "PMU code version not supported version: %d\n", + pmu->desc->app_version); return -EINVAL; break; } 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 @@ /* Mapping between AP_CTRLs and Idle counters */ #define PMU_AP_IDLE_MASK_GRAPHICS (PMU_AP_IDLE_MASK_HIST_IDX_1) +#define APP_VERSION_2 18542378 #define APP_VERSION_1 17997577 #define APP_VERSION_0 16856675 -- cgit v1.2.2