From bda01cda7ad4fa97c23b35c7816b1a0fe6883fca Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Thu, 6 Aug 2015 12:00:28 +0530 Subject: gpu: nvgpu: T186 GR FW version update - pmu version update to sync with CL-19816709 - GPCCS version update to sync with CL-19816709 Change-Id: Ia60bb538ddba35c973183ca2d4d3a7a0013b4b59 Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/779628 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 1 + drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 4 ++++ drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index a9d794c2..472dcc26 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -1976,6 +1976,7 @@ void gr_gk20a_load_ctxsw_ucode_header(struct gk20a *g, u64 addr_base, /* Write out the actual data */ switch (segments->boot_signature) { + case FALCON_UCODE_SIG_T18X_GPCCS_WITH_RESERVED: case FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED: case FALCON_UCODE_SIG_T21X_GPCCS_WITH_RESERVED: case FALCON_UCODE_SIG_T12X_FECS_WITH_RESERVED: diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 0909b660..6444a22d 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h @@ -324,6 +324,10 @@ struct gk20a_ctxsw_ucode_segments { /* sums over the ucode files as sequences of u32, computed to the * boot_signature field in the structure above */ +/* T18X FECS remains same as T21X, + * so FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED used + * for T18X*/ +#define FALCON_UCODE_SIG_T18X_GPCCS_WITH_RESERVED 0x68edab34 #define FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED 0x9125ab5c #define FALCON_UCODE_SIG_T12X_FECS_WITH_RESERVED 0x8a621f78 #define FALCON_UCODE_SIG_T12X_FECS_WITHOUT_RESERVED 0x67e5344b diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index 0682e4b8..6676c2e5 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h @@ -49,7 +49,7 @@ /* Mapping between AP_CTRLs and Idle counters */ #define PMU_AP_IDLE_MASK_GRAPHICS (PMU_AP_IDLE_MASK_HIST_IDX_1) -#define APP_VERSION_T186_0 19494277 +#define APP_VERSION_T186_0 19816464 #define APP_VERSION_GM20B_4 19008461 #define APP_VERSION_GM20B_3 18935575 #define APP_VERSION_GM20B_2 18694072 -- cgit v1.2.2