diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2018-06-10 01:46:09 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:08 -0400 |
commit | b282753126accf0e8e58396dec08c9472a132c3a (patch) | |
tree | e556854175c10eff4d21e165da25eda6f91df739 | |
parent | 5f74aa99e068fd5a84798d4909b1ee04c8821731 (diff) |
gpu: nvgpu: GPU NEXT PMU version update
- PMU version update for NEXT GPU
- Added condition to assign correct ops
for NEXT GPU.
P4 CL#: 24313845
Change-Id: Ia6ee5978d450c228b4f298382746e06da56056a5
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1745022
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_fw.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c index a1e3dfd0..893bd5b3 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #define NVGPU_PMU_NS_UCODE_IMAGE "gpmu_ucode.bin" | 36 | #define NVGPU_PMU_NS_UCODE_IMAGE "gpmu_ucode.bin" |
37 | 37 | ||
38 | /* PMU F/W version */ | 38 | /* PMU F/W version */ |
39 | #define APP_VERSION_GPU_NEXT 24313304 | ||
39 | #define APP_VERSION_GV11B 24160752 | 40 | #define APP_VERSION_GV11B 24160752 |
40 | #define APP_VERSION_GV10X 23647491 | 41 | #define APP_VERSION_GV10X 23647491 |
41 | #define APP_VERSION_GP10X 24069912 | 42 | #define APP_VERSION_GP10X 24069912 |
@@ -1218,6 +1219,7 @@ static int nvgpu_init_pmu_fw_ver_ops(struct nvgpu_pmu *pmu) | |||
1218 | break; | 1219 | break; |
1219 | case APP_VERSION_GV11B: | 1220 | case APP_VERSION_GV11B: |
1220 | case APP_VERSION_GV10X: | 1221 | case APP_VERSION_GV10X: |
1222 | case APP_VERSION_GPU_NEXT: | ||
1221 | g->ops.pmu_ver.pg_cmd_eng_buf_load_size = | 1223 | g->ops.pmu_ver.pg_cmd_eng_buf_load_size = |
1222 | pg_cmd_eng_buf_load_size_v2; | 1224 | pg_cmd_eng_buf_load_size_v2; |
1223 | g->ops.pmu_ver.pg_cmd_eng_buf_load_set_cmd_type = | 1225 | g->ops.pmu_ver.pg_cmd_eng_buf_load_set_cmd_type = |
@@ -1282,7 +1284,8 @@ static int nvgpu_init_pmu_fw_ver_ops(struct nvgpu_pmu *pmu) | |||
1282 | pmu_allocation_get_fb_addr_v3; | 1284 | pmu_allocation_get_fb_addr_v3; |
1283 | g->ops.pmu_ver.pmu_allocation_get_fb_size = | 1285 | g->ops.pmu_ver.pmu_allocation_get_fb_size = |
1284 | pmu_allocation_get_fb_size_v3; | 1286 | pmu_allocation_get_fb_size_v3; |
1285 | if (pmu->desc->app_version == APP_VERSION_GV10X) { | 1287 | if (pmu->desc->app_version == APP_VERSION_GV10X || |
1288 | pmu->desc->app_version == APP_VERSION_GPU_NEXT) { | ||
1286 | g->ops.pmu_ver.get_pmu_init_msg_pmu_queue_params = | 1289 | g->ops.pmu_ver.get_pmu_init_msg_pmu_queue_params = |
1287 | get_pmu_init_msg_pmu_queue_params_v5; | 1290 | get_pmu_init_msg_pmu_queue_params_v5; |
1288 | g->ops.pmu_ver.get_pmu_msg_pmu_init_msg_ptr = | 1291 | g->ops.pmu_ver.get_pmu_msg_pmu_init_msg_ptr = |