From 697fe17dd612769633f8c93e37b65cc51966d7e7 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 20 Sep 2016 08:48:16 -0700 Subject: gpu: nvgpu: Suppress error msg from VBIOS overlay Suppress error message when nvgpu tries to load VBIOS overlay, but one is not found. This situation is normal. This is done by moving gk20a_request_firmware() to be nvgpu generic function nvgpu_request_firmware(), and adding a NO_WARN flag to it. Introduce also a NO_SOC flag to suppress attempt to load firmware from SoC specific directory in addition to the chip specific directory. Use it for dGPU firmware files. Bug 200236777 Change-Id: I0294d3308f029a6a6d3c2effa579d5f69a91e418 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1223840 (cherry picked from commit cca44c3f010f15918cdd2259c15170ba1917828a) Reviewed-on: http://git-master/r/1233353 GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index ca9f2e15..fc95b5bc 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c @@ -30,6 +30,7 @@ #include "hw_mc_gk20a.h" #include "hw_pwr_gk20a.h" #include "hw_top_gk20a.h" +#include "nvgpu_common.h" #ifdef CONFIG_ARCH_TEGRA_18x_SOC #include "nvgpu_gpuid_t18x.h" @@ -2883,6 +2884,8 @@ void gk20a_remove_pmu_support(struct pmu_gk20a *pmu) if (gk20a_alloc_initialized(&pmu->dmem)) gk20a_alloc_destroy(&pmu->dmem); + + release_firmware(pmu->fw); } static int gk20a_init_pmu_reset_enable_hw(struct gk20a *g) @@ -2904,18 +2907,18 @@ 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) + if (pmu->fw) return gk20a_init_pmu(pmu); - g->pmu_fw = gk20a_request_firmware(g, GK20A_PMU_UCODE_IMAGE); - if (!g->pmu_fw) { + pmu->fw = nvgpu_request_firmware(g, GK20A_PMU_UCODE_IMAGE, 0); + if (!pmu->fw) { gk20a_err(d, "failed to load pmu ucode!!"); return err; } gk20a_dbg_fn("firmware loaded"); - pmu->desc = (struct pmu_ucode_desc *)g->pmu_fw->data; + pmu->desc = (struct pmu_ucode_desc *)pmu->fw->data; pmu->ucode_image = (u32 *)((u8 *)pmu->desc + pmu->desc->descriptor_size); @@ -2930,7 +2933,8 @@ static int gk20a_prepare_ucode(struct gk20a *g) return gk20a_init_pmu(pmu); err_release_fw: - release_firmware(g->pmu_fw); + release_firmware(pmu->fw); + pmu->fw = NULL; return err; } -- cgit v1.2.2