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/gk20a.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 1cccaebe..2b55dd26 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -762,11 +762,6 @@ struct gk20a { #ifdef CONFIG_DEBUG_FS struct railgate_stats pstats; #endif - /* Save pmu fw here so that it lives cross suspend/resume. - pmu suspend destroys all pmu sw/hw states. Loading pmu - fw in resume crashes when the resume is from sys_exit. */ - const struct firmware *pmu_fw; - u32 gr_idle_timeout_default; #if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) u32 timeouts_enabled; @@ -1178,9 +1173,6 @@ int gk20a_do_unidle(void); int __gk20a_do_idle(struct device *dev, bool force_reset); int __gk20a_do_unidle(struct device *dev); -const struct firmware * -gk20a_request_firmware(struct gk20a *g, const char *fw_name); - #define NVGPU_GPU_ARCHITECTURE_SHIFT 4 /* constructs unique and compact GPUID from nvgpu_gpu_characteristics -- cgit v1.2.2