From a9c66768db400a82575a82ecddec71f1d3fd4aba Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 14 Apr 2017 12:06:39 -0700 Subject: gpu: nvgpu: Add abstraction for firmware loading Add nvgpu_firmware data structure, and return it instead of Linux struct firmare from nvgpu_request_firmware. Also add abstraction for releasing firmware: nvgpu_release_firmware. JIRA NVGPU-16 Change-Id: I6dae8262957c0d4506f710289e3a43a6c1729fc7 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1463538 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gm206/bios_gm206.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gm206/bios_gm206.c') diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index 2c84ac62..f460a053 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c @@ -11,13 +11,13 @@ * more details. */ -#include #include #include #include #include #include +#include #include "gk20a/gk20a.h" #include "gm20b/fifo_gm20b.h" @@ -249,7 +249,7 @@ int gm206_bios_init(struct gk20a *g) unsigned int i; struct gk20a_platform *platform = dev_get_drvdata(g->dev); struct dentry *d; - const struct firmware *bios_fw; + struct nvgpu_firmware *bios_fw; int err; struct pci_dev *pdev = to_pci_dev(g->dev); char rom_name[sizeof(BIOS_OVERLAY_NAME_FORMATTED)]; @@ -273,7 +273,7 @@ int gm206_bios_init(struct gk20a *g) memcpy(g->bios.data, &bios_fw->data[ROM_FILE_PAYLOAD_OFFSET], g->bios.size); - release_firmware(bios_fw); + nvgpu_release_firmware(g, bios_fw); } else { gk20a_dbg_info("reading bios from EEPROM"); g->bios.size = BIOS_SIZE; @@ -336,7 +336,7 @@ int gm206_bios_init(struct gk20a *g) return 0; free_firmware: - release_firmware(bios_fw); + nvgpu_release_firmware(g, bios_fw); return err; } -- cgit v1.2.2