nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Check result of gk20a_pmu_init

Browse Source 
If PMU version is not supported, gk20a_pmu_init returns an error
code. Check the error code and fail poweron if gk20a_pmu_init
fails.

Change-Id: Ia1d6a6fcbcc5a144d2e5bc88734df778e887fa53
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1160371
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
This commit is contained in:
Terje Bergstrom
2016-06-07 13:05:38 -07:00
parent 832e4fce1e
commit 3490cf9f2a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
View File

@@ -2877,10 +2877,8 @@ static int gk20a_prepare_ucode(struct gk20a *g)
struct mm_gk20a *mm = &g->mm;
struct vm_gk20a *vm = &mm->pmu.vm;
if (g->pmu_fw) {
gk20a_init_pmu(pmu);
return 0;
}
if (g->pmu_fw)
return gk20a_init_pmu(pmu);
g->pmu_fw = gk20a_request_firmware(g, GK20A_PMU_UCODE_IMAGE);
if (!g->pmu_fw) {
@@ -2901,9 +2899,7 @@ static int gk20a_prepare_ucode(struct gk20a *g)
gk20a_mem_wr_n(g, &pmu->ucode, 0, pmu->ucode_image,
pmu->desc->app_start_offset + pmu->desc->app_size);
gk20a_init_pmu(pmu);
return 0;
return gk20a_init_pmu(pmu);
err_release_fw:
release_firmware(g->pmu_fw);