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

2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.c b/drivers/gpu/nvgpu/gm206/acr_gm206.c
index 39b30ea6..872ff601 100644
--- a/drivers/gpu/nvgpu/gm206/acr_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/acr_gm206.c
@@ -25,6 +25,7 @@
 #include "hw_pwr_gm206.h"
 #include "acr.h"
 #include "acr_gm206.h"
+#include "nvgpu_common.h"
 
 /*Defines*/
 #define gm206_dbg_pmu(fmt, arg...) \
@@ -226,7 +227,9 @@ static int gm206_bootstrap_hs_flcn(struct gk20a *g)
 
         if (!acr_fw) {
                 /*First time init case*/
-                acr_fw = gk20a_request_firmware(g, GM20B_HSBIN_PMU_UCODE_IMAGE);
+                acr_fw = nvgpu_request_firmware(g,
+                                GM20B_HSBIN_PMU_UCODE_IMAGE,
+                                NVGPU_REQUEST_FIRMWARE_NO_SOC);
                 if (!acr_fw) {
                         gk20a_err(dev_from_gk20a(g), "pmu ucode get fail");
                         return -ENOENT;
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c
index 6a509b04..a8f3f1d5 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c
@@ -24,6 +24,7 @@
 #include "hw_xve_gm206.h"
 #include "hw_top_gm206.h"
 #include "bios_gm206.h"
+#include "nvgpu_common.h"
 
 #define BIT_HEADER_ID 0xb8ff
 #define BIT_HEADER_SIGNATURE 0x00544942
@@ -739,7 +740,9 @@ static int gm206_bios_init(struct gk20a *g)
 
         snprintf(rom_name, sizeof(rom_name), BIOS_OVERLAY_NAME, pdev->device);
         gk20a_dbg_info("checking for VBIOS overlay %s", rom_name);
-        bios_fw = gk20a_request_firmware(g, rom_name);
+        bios_fw = nvgpu_request_firmware(g, rom_name,
+                        NVGPU_REQUEST_FIRMWARE_NO_WARN |
+                        NVGPU_REQUEST_FIRMWARE_NO_SOC);
         if (bios_fw) {
                 gk20a_dbg_info("using VBIOS overlay");
                 g->bios.size = bios_fw->size - ROM_FILE_PAYLOAD_OFFSET;