diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm206')
-rw-r--r-- | drivers/gpu/nvgpu/gm206/acr_gm206.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm206/bios_gm206.c | 5 |
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 @@ | |||
25 | #include "hw_pwr_gm206.h" | 25 | #include "hw_pwr_gm206.h" |
26 | #include "acr.h" | 26 | #include "acr.h" |
27 | #include "acr_gm206.h" | 27 | #include "acr_gm206.h" |
28 | #include "nvgpu_common.h" | ||
28 | 29 | ||
29 | /*Defines*/ | 30 | /*Defines*/ |
30 | #define gm206_dbg_pmu(fmt, arg...) \ | 31 | #define gm206_dbg_pmu(fmt, arg...) \ |
@@ -226,7 +227,9 @@ static int gm206_bootstrap_hs_flcn(struct gk20a *g) | |||
226 | 227 | ||
227 | if (!acr_fw) { | 228 | if (!acr_fw) { |
228 | /*First time init case*/ | 229 | /*First time init case*/ |
229 | acr_fw = gk20a_request_firmware(g, GM20B_HSBIN_PMU_UCODE_IMAGE); | 230 | acr_fw = nvgpu_request_firmware(g, |
231 | GM20B_HSBIN_PMU_UCODE_IMAGE, | ||
232 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | ||
230 | if (!acr_fw) { | 233 | if (!acr_fw) { |
231 | gk20a_err(dev_from_gk20a(g), "pmu ucode get fail"); | 234 | gk20a_err(dev_from_gk20a(g), "pmu ucode get fail"); |
232 | return -ENOENT; | 235 | 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 @@ | |||
24 | #include "hw_xve_gm206.h" | 24 | #include "hw_xve_gm206.h" |
25 | #include "hw_top_gm206.h" | 25 | #include "hw_top_gm206.h" |
26 | #include "bios_gm206.h" | 26 | #include "bios_gm206.h" |
27 | #include "nvgpu_common.h" | ||
27 | 28 | ||
28 | #define BIT_HEADER_ID 0xb8ff | 29 | #define BIT_HEADER_ID 0xb8ff |
29 | #define BIT_HEADER_SIGNATURE 0x00544942 | 30 | #define BIT_HEADER_SIGNATURE 0x00544942 |
@@ -739,7 +740,9 @@ static int gm206_bios_init(struct gk20a *g) | |||
739 | 740 | ||
740 | snprintf(rom_name, sizeof(rom_name), BIOS_OVERLAY_NAME, pdev->device); | 741 | snprintf(rom_name, sizeof(rom_name), BIOS_OVERLAY_NAME, pdev->device); |
741 | gk20a_dbg_info("checking for VBIOS overlay %s", rom_name); | 742 | gk20a_dbg_info("checking for VBIOS overlay %s", rom_name); |
742 | bios_fw = gk20a_request_firmware(g, rom_name); | 743 | bios_fw = nvgpu_request_firmware(g, rom_name, |
744 | NVGPU_REQUEST_FIRMWARE_NO_WARN | | ||
745 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | ||
743 | if (bios_fw) { | 746 | if (bios_fw) { |
744 | gk20a_dbg_info("using VBIOS overlay"); | 747 | gk20a_dbg_info("using VBIOS overlay"); |
745 | g->bios.size = bios_fw->size - ROM_FILE_PAYLOAD_OFFSET; | 748 | g->bios.size = bios_fw->size - ROM_FILE_PAYLOAD_OFFSET; |