summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.h
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-09-20 11:48:16 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2016-10-09 16:03:35 -0400
commit697fe17dd612769633f8c93e37b65cc51966d7e7 (patch)
treecbf09661d91c10ca9149f40661aab119a7850302 /drivers/gpu/nvgpu/gk20a/gk20a.h
parent4cff26cd5b0096eeb26114cf36df8e2cb91821a8 (diff)
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 <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1223840 (cherry picked from commit cca44c3f010f15918cdd2259c15170ba1917828a) Reviewed-on: http://git-master/r/1233353 GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h8
1 files changed, 0 insertions, 8 deletions
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 {
762#ifdef CONFIG_DEBUG_FS 762#ifdef CONFIG_DEBUG_FS
763 struct railgate_stats pstats; 763 struct railgate_stats pstats;
764#endif 764#endif
765 /* Save pmu fw here so that it lives cross suspend/resume.
766 pmu suspend destroys all pmu sw/hw states. Loading pmu
767 fw in resume crashes when the resume is from sys_exit. */
768 const struct firmware *pmu_fw;
769
770 u32 gr_idle_timeout_default; 765 u32 gr_idle_timeout_default;
771#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0) 766#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)
772 u32 timeouts_enabled; 767 u32 timeouts_enabled;
@@ -1178,9 +1173,6 @@ int gk20a_do_unidle(void);
1178int __gk20a_do_idle(struct device *dev, bool force_reset); 1173int __gk20a_do_idle(struct device *dev, bool force_reset);
1179int __gk20a_do_unidle(struct device *dev); 1174int __gk20a_do_unidle(struct device *dev);
1180 1175
1181const struct firmware *
1182gk20a_request_firmware(struct gk20a *g, const char *fw_name);
1183
1184#define NVGPU_GPU_ARCHITECTURE_SHIFT 4 1176#define NVGPU_GPU_ARCHITECTURE_SHIFT 4
1185 1177
1186/* constructs unique and compact GPUID from nvgpu_gpu_characteristics 1178/* constructs unique and compact GPUID from nvgpu_gpu_characteristics