diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index a4419885..0e787356 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | 17 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/firmware.h> | ||
21 | #include <trace/events/gk20a.h> | 20 | #include <trace/events/gk20a.h> |
22 | 21 | ||
23 | #include <nvgpu/dma.h> | 22 | #include <nvgpu/dma.h> |
@@ -28,6 +27,7 @@ | |||
28 | #include <nvgpu/bsearch.h> | 27 | #include <nvgpu/bsearch.h> |
29 | #include <nvgpu/sort.h> | 28 | #include <nvgpu/sort.h> |
30 | #include <nvgpu/bug.h> | 29 | #include <nvgpu/bug.h> |
30 | #include <nvgpu/firmware.h> | ||
31 | 31 | ||
32 | #include "gk20a.h" | 32 | #include "gk20a.h" |
33 | #include "kind_gk20a.h" | 33 | #include "kind_gk20a.h" |
@@ -2272,8 +2272,8 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g) | |||
2272 | struct vm_gk20a *vm = &mm->pmu.vm; | 2272 | struct vm_gk20a *vm = &mm->pmu.vm; |
2273 | struct gk20a_ctxsw_bootloader_desc *fecs_boot_desc; | 2273 | struct gk20a_ctxsw_bootloader_desc *fecs_boot_desc; |
2274 | struct gk20a_ctxsw_bootloader_desc *gpccs_boot_desc; | 2274 | struct gk20a_ctxsw_bootloader_desc *gpccs_boot_desc; |
2275 | const struct firmware *fecs_fw; | 2275 | struct nvgpu_firmware *fecs_fw; |
2276 | const struct firmware *gpccs_fw; | 2276 | struct nvgpu_firmware *gpccs_fw; |
2277 | u32 *fecs_boot_image; | 2277 | u32 *fecs_boot_image; |
2278 | u32 *gpccs_boot_image; | 2278 | u32 *gpccs_boot_image; |
2279 | struct gk20a_ctxsw_ucode_info *ucode_info = &g->ctxsw_ucode_info; | 2279 | struct gk20a_ctxsw_ucode_info *ucode_info = &g->ctxsw_ucode_info; |
@@ -2292,7 +2292,7 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g) | |||
2292 | 2292 | ||
2293 | gpccs_fw = nvgpu_request_firmware(g, GK20A_GPCCS_UCODE_IMAGE, 0); | 2293 | gpccs_fw = nvgpu_request_firmware(g, GK20A_GPCCS_UCODE_IMAGE, 0); |
2294 | if (!gpccs_fw) { | 2294 | if (!gpccs_fw) { |
2295 | release_firmware(fecs_fw); | 2295 | nvgpu_release_firmware(g, fecs_fw); |
2296 | nvgpu_err(g, "failed to load gpccs ucode!!"); | 2296 | nvgpu_err(g, "failed to load gpccs ucode!!"); |
2297 | return -ENOENT; | 2297 | return -ENOENT; |
2298 | } | 2298 | } |
@@ -2321,7 +2321,7 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g) | |||
2321 | g->gr.ctx_vars.ucode.fecs.inst.l, | 2321 | g->gr.ctx_vars.ucode.fecs.inst.l, |
2322 | g->gr.ctx_vars.ucode.fecs.data.l); | 2322 | g->gr.ctx_vars.ucode.fecs.data.l); |
2323 | 2323 | ||
2324 | release_firmware(fecs_fw); | 2324 | nvgpu_release_firmware(g, fecs_fw); |
2325 | fecs_fw = NULL; | 2325 | fecs_fw = NULL; |
2326 | 2326 | ||
2327 | gr_gk20a_copy_ctxsw_ucode_segments(g, &ucode_info->surface_desc, | 2327 | gr_gk20a_copy_ctxsw_ucode_segments(g, &ucode_info->surface_desc, |
@@ -2330,7 +2330,7 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g) | |||
2330 | g->gr.ctx_vars.ucode.gpccs.inst.l, | 2330 | g->gr.ctx_vars.ucode.gpccs.inst.l, |
2331 | g->gr.ctx_vars.ucode.gpccs.data.l); | 2331 | g->gr.ctx_vars.ucode.gpccs.data.l); |
2332 | 2332 | ||
2333 | release_firmware(gpccs_fw); | 2333 | nvgpu_release_firmware(g, gpccs_fw); |
2334 | gpccs_fw = NULL; | 2334 | gpccs_fw = NULL; |
2335 | 2335 | ||
2336 | err = gr_gk20a_init_ctxsw_ucode_vaspace(g); | 2336 | err = gr_gk20a_init_ctxsw_ucode_vaspace(g); |
@@ -2345,9 +2345,9 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g) | |||
2345 | ucode_info->surface_desc.size, gk20a_mem_flag_none); | 2345 | ucode_info->surface_desc.size, gk20a_mem_flag_none); |
2346 | nvgpu_dma_free(g, &ucode_info->surface_desc); | 2346 | nvgpu_dma_free(g, &ucode_info->surface_desc); |
2347 | 2347 | ||
2348 | release_firmware(gpccs_fw); | 2348 | nvgpu_release_firmware(g, gpccs_fw); |
2349 | gpccs_fw = NULL; | 2349 | gpccs_fw = NULL; |
2350 | release_firmware(fecs_fw); | 2350 | nvgpu_release_firmware(g, fecs_fw); |
2351 | fecs_fw = NULL; | 2351 | fecs_fw = NULL; |
2352 | 2352 | ||
2353 | return err; | 2353 | return err; |