From e34b945834c4fa0ca7aa50224e8d77fafa5fe7e3 Mon Sep 17 00:00:00 2001 From: Supriya Date: Thu, 24 Jul 2014 14:14:32 +0530 Subject: nvgpu: new gpmu ucode compatibility For LS PMU new ucode needs to be used. Ucode has interface header file changes too. This patch also has fixes for pmu dmem copy failure Bug 1509680 Change-Id: I8c7018f889a82104dea590751e650e53e5524a54 Signed-off-by: Supriya Reviewed-on: http://git-master/r/441734 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm20b/acr_gm20b.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.h') diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.h b/drivers/gpu/nvgpu/gm20b/acr_gm20b.h index 073dc135..b186e489 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.h @@ -24,7 +24,8 @@ #define MAX_SUPPORTED_LSFM 2 /*PMU, FECS, GPCCS*/ #define LSF_UCODE_DATA_ALIGNMENT 4096 -#define GM20B_PMU_UCODE_IMAGE "gpmu_ucode.bin" +#define GM20B_PMU_UCODE_IMAGE "gpmu_ucode_image.bin" +#define GM20B_PMU_UCODE_DESC "gpmu_ucode_desc.bin" #define GM20B_HSBIN_PMU_UCODE_IMAGE "acr_ucode.bin" #define GM20B_HSBIN_PMU_BL_UCODE_IMAGE "pmu_bl.bin" @@ -363,6 +364,7 @@ struct acr_gm20b { struct hsflcn_bl_desc *pmu_hsbl_desc; struct bin_hdr *hsbin_hdr; struct acr_fw_header *fw_hdr; + u32 pmu_args; }; void gm20b_init_secure_pmu(struct gpu_ops *gops); -- cgit v1.2.2