diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2015-08-06 02:30:28 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-08-10 11:40:32 -0400 |
commit | bda01cda7ad4fa97c23b35c7816b1a0fe6883fca (patch) | |
tree | 93a4d00b8bbaf067bcffe4b99cbf12f526b2800b /drivers/gpu | |
parent | c27e094002e9d670df45c3b61591a7a9a3a3482d (diff) |
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 <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/779628
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 2 |
3 files changed, 6 insertions, 1 deletions
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, | |||
1976 | 1976 | ||
1977 | /* Write out the actual data */ | 1977 | /* Write out the actual data */ |
1978 | switch (segments->boot_signature) { | 1978 | switch (segments->boot_signature) { |
1979 | case FALCON_UCODE_SIG_T18X_GPCCS_WITH_RESERVED: | ||
1979 | case FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED: | 1980 | case FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED: |
1980 | case FALCON_UCODE_SIG_T21X_GPCCS_WITH_RESERVED: | 1981 | case FALCON_UCODE_SIG_T21X_GPCCS_WITH_RESERVED: |
1981 | case FALCON_UCODE_SIG_T12X_FECS_WITH_RESERVED: | 1982 | 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 { | |||
324 | /* sums over the ucode files as sequences of u32, computed to the | 324 | /* sums over the ucode files as sequences of u32, computed to the |
325 | * boot_signature field in the structure above */ | 325 | * boot_signature field in the structure above */ |
326 | 326 | ||
327 | /* T18X FECS remains same as T21X, | ||
328 | * so FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED used | ||
329 | * for T18X*/ | ||
330 | #define FALCON_UCODE_SIG_T18X_GPCCS_WITH_RESERVED 0x68edab34 | ||
327 | #define FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED 0x9125ab5c | 331 | #define FALCON_UCODE_SIG_T21X_FECS_WITH_RESERVED 0x9125ab5c |
328 | #define FALCON_UCODE_SIG_T12X_FECS_WITH_RESERVED 0x8a621f78 | 332 | #define FALCON_UCODE_SIG_T12X_FECS_WITH_RESERVED 0x8a621f78 |
329 | #define FALCON_UCODE_SIG_T12X_FECS_WITHOUT_RESERVED 0x67e5344b | 333 | #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 @@ | |||
49 | /* Mapping between AP_CTRLs and Idle counters */ | 49 | /* Mapping between AP_CTRLs and Idle counters */ |
50 | #define PMU_AP_IDLE_MASK_GRAPHICS (PMU_AP_IDLE_MASK_HIST_IDX_1) | 50 | #define PMU_AP_IDLE_MASK_GRAPHICS (PMU_AP_IDLE_MASK_HIST_IDX_1) |
51 | 51 | ||
52 | #define APP_VERSION_T186_0 19494277 | 52 | #define APP_VERSION_T186_0 19816464 |
53 | #define APP_VERSION_GM20B_4 19008461 | 53 | #define APP_VERSION_GM20B_4 19008461 |
54 | #define APP_VERSION_GM20B_3 18935575 | 54 | #define APP_VERSION_GM20B_3 18935575 |
55 | #define APP_VERSION_GM20B_2 18694072 | 55 | #define APP_VERSION_GM20B_2 18694072 |