From 3490cf9f2a5b2e2ca7cf6c5ffc50bcb6d563df2c Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 7 Jun 2016 13:05:38 -0700 Subject: gpu: nvgpu: Check result of gk20a_pmu_init 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 Reviewed-on: http://git-master/r/1160371 Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta --- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 31cae4fd..a1e0be19 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c @@ -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); -- cgit v1.2.2