From b282753126accf0e8e58396dec08c9472a132c3a Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Sun, 10 Jun 2018 11:16:09 +0530 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1745022 Reviewed-by: svc-mobile-coverity Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/pmu/pmu_fw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/pmu') 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 @@ #define NVGPU_PMU_NS_UCODE_IMAGE "gpmu_ucode.bin" /* PMU F/W version */ +#define APP_VERSION_GPU_NEXT 24313304 #define APP_VERSION_GV11B 24160752 #define APP_VERSION_GV10X 23647491 #define APP_VERSION_GP10X 24069912 @@ -1218,6 +1219,7 @@ static int nvgpu_init_pmu_fw_ver_ops(struct nvgpu_pmu *pmu) break; case APP_VERSION_GV11B: case APP_VERSION_GV10X: + case APP_VERSION_GPU_NEXT: g->ops.pmu_ver.pg_cmd_eng_buf_load_size = pg_cmd_eng_buf_load_size_v2; 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) pmu_allocation_get_fb_addr_v3; g->ops.pmu_ver.pmu_allocation_get_fb_size = pmu_allocation_get_fb_size_v3; - if (pmu->desc->app_version == APP_VERSION_GV10X) { + if (pmu->desc->app_version == APP_VERSION_GV10X || + pmu->desc->app_version == APP_VERSION_GPU_NEXT) { g->ops.pmu_ver.get_pmu_init_msg_pmu_queue_params = get_pmu_init_msg_pmu_queue_params_v5; g->ops.pmu_ver.get_pmu_msg_pmu_init_msg_ptr = -- cgit v1.2.2