diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2016-06-10 13:32:20 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-15 16:57:07 -0400 |
commit | 7bd2329ab83735a2d2bbac16a575c311e9c33e03 (patch) | |
tree | da45d0a179e04310f26538e8a3917aa5b8de0c89 /drivers/gpu/nvgpu | |
parent | 75f6a1dff48bba1fe08ef82a76a0fa5727f3b6f8 (diff) |
gpu: nvgpu: PMU version update
JIRA DNVGPU-34
Change-Id: Ib9618bdd928a02917b40e6f9619265bf27aa6879
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1162632
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 1 |
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 a1e0be19..b0940229 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -1442,6 +1442,7 @@ int gk20a_init_pmu(struct pmu_gk20a *pmu) | |||
1442 | break; | 1442 | break; |
1443 | case APP_VERSION_GM206: | 1443 | case APP_VERSION_GM206: |
1444 | case APP_VERSION_NV_GPU: | 1444 | case APP_VERSION_NV_GPU: |
1445 | case APP_VERSION_NV_GPU_1: | ||
1445 | g->ops.pmu_ver.pg_cmd_eng_buf_load_size = | 1446 | g->ops.pmu_ver.pg_cmd_eng_buf_load_size = |
1446 | pg_cmd_eng_buf_load_size_v2; | 1447 | pg_cmd_eng_buf_load_size_v2; |
1447 | g->ops.pmu_ver.pg_cmd_eng_buf_load_set_cmd_type = | 1448 | g->ops.pmu_ver.pg_cmd_eng_buf_load_set_cmd_type = |
@@ -1500,7 +1501,8 @@ int gk20a_init_pmu(struct pmu_gk20a *pmu) | |||
1500 | g->ops.pmu_ver.pmu_allocation_set_dmem_offset = | 1501 | g->ops.pmu_ver.pmu_allocation_set_dmem_offset = |
1501 | pmu_allocation_set_dmem_offset_v3; | 1502 | pmu_allocation_set_dmem_offset_v3; |
1502 | 1503 | ||
1503 | if(pmu->desc->app_version != APP_VERSION_NV_GPU) { | 1504 | if(pmu->desc->app_version != APP_VERSION_NV_GPU && |
1505 | pmu->desc->app_version != APP_VERSION_NV_GPU_1) { | ||
1504 | g->ops.pmu_ver.get_pmu_init_msg_pmu_queue_params = | 1506 | g->ops.pmu_ver.get_pmu_init_msg_pmu_queue_params = |
1505 | get_pmu_init_msg_pmu_queue_params_v2; | 1507 | get_pmu_init_msg_pmu_queue_params_v2; |
1506 | g->ops.pmu_ver.get_pmu_msg_pmu_init_msg_ptr = | 1508 | g->ops.pmu_ver.get_pmu_msg_pmu_init_msg_ptr = |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index 85f1ffc1..bbcccdeb 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |||
@@ -54,6 +54,7 @@ | |||
54 | #define APP_VERSION_NC_0 20360931 | 54 | #define APP_VERSION_NC_0 20360931 |
55 | #define APP_VERSION_GM206 20652057 | 55 | #define APP_VERSION_GM206 20652057 |
56 | #define APP_VERSION_NV_GPU 20660622 | 56 | #define APP_VERSION_NV_GPU 20660622 |
57 | #define APP_VERSION_NV_GPU_1 20799797 | ||
57 | #define APP_VERSION_GM20B_5 20490253 | 58 | #define APP_VERSION_GM20B_5 20490253 |
58 | #define APP_VERSION_GM20B_4 19008461 | 59 | #define APP_VERSION_GM20B_4 19008461 |
59 | #define APP_VERSION_GM20B_3 18935575 | 60 | #define APP_VERSION_GM20B_3 18935575 |