5 files changed, 30 insertions, 27 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
index 2187e833..18432c55 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/dma-mapping.h>
-#include <linux/firmware.h>
 #include <linux/fs.h>
 #include <linux/debugfs.h>
 #include <linux/dma-buf.h>
@@ -30,6 +29,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/firmware.h>
 
 #include "gk20a.h"
 #include "channel_gk20a.h"
@@ -226,7 +226,7 @@ out:
 }
 
 static int gk20a_init_cde_buf(struct gk20a_cde_ctx *cde_ctx,
-                              const struct firmware *img,
+                              struct nvgpu_firmware *img,
                               struct gk20a_cde_hdr_buf *buf)
 {
         struct nvgpu_mem *mem;
@@ -314,7 +314,7 @@ static int gk20a_replace_data(struct gk20a_cde_ctx *cde_ctx, void *target,
 }
 
 static int gk20a_init_cde_replace(struct gk20a_cde_ctx *cde_ctx,
-                                  const struct firmware *img,
+                                  struct nvgpu_firmware *img,
                                   struct gk20a_cde_hdr_replace *replace)
 {
         struct nvgpu_mem *source_mem;
@@ -454,7 +454,7 @@ static int gk20a_cde_patch_params(struct gk20a_cde_ctx *cde_ctx)
 }
 
 static int gk20a_init_cde_param(struct gk20a_cde_ctx *cde_ctx,
-                                const struct firmware *img,
+                                struct nvgpu_firmware *img,
                                 struct gk20a_cde_hdr_param *param)
 {
         struct nvgpu_mem *target_mem;
@@ -497,7 +497,7 @@ static int gk20a_init_cde_param(struct gk20a_cde_ctx *cde_ctx,
 }
 
 static int gk20a_init_cde_required_class(struct gk20a_cde_ctx *cde_ctx,
-                                         const struct firmware *img,
+                                         struct nvgpu_firmware *img,
                                          u32 required_class)
 {
         struct gk20a *g = cde_ctx->g;
@@ -521,7 +521,7 @@ static int gk20a_init_cde_required_class(struct gk20a_cde_ctx *cde_ctx,
 }
 
 static int gk20a_init_cde_command(struct gk20a_cde_ctx *cde_ctx,
-                                  const struct firmware *img,
+                                  struct nvgpu_firmware *img,
                                   u32 op,
                                   struct gk20a_cde_cmd_elem *cmd_elem,
                                   u32 num_elems)
@@ -622,7 +622,7 @@ static int gk20a_cde_pack_cmdbufs(struct gk20a_cde_ctx *cde_ctx)
 }
 
 static int gk20a_init_cde_img(struct gk20a_cde_ctx *cde_ctx,
-                              const struct firmware *img)
+                              struct nvgpu_firmware *img)
 {
         struct gk20a *g = cde_ctx->g;
         struct gk20a_cde_app *cde_app = &cde_ctx->g->cde_app;
@@ -1202,7 +1202,7 @@ __releases(&cde_app->mutex)
 static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx)
 {
         struct gk20a *g = cde_ctx->g;
-        const struct firmware *img;
+        struct nvgpu_firmware *img;
         struct channel_gk20a *ch;
         struct gr_gk20a *gr = &g->gr;
         int err = 0;
@@ -1265,7 +1265,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx)
         }
 
         /* initialisation done */
-        release_firmware(img);
+        nvgpu_release_firmware(g, img);
 
         return 0;
 
@@ -1276,7 +1276,7 @@ err_alloc_gpfifo:
         gk20a_vm_put(ch->vm);
 err_commit_va:
 err_get_gk20a_channel:
-        release_firmware(img);
+        nvgpu_release_firmware(g, img);
         nvgpu_err(g, "cde: couldn't initialise buffer converter: %d", err);
         return err;
 }
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
index 712359e1..3c6d8924 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
@@ -19,11 +19,10 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <linux/firmware.h>
-
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
+#include <nvgpu/firmware.h>
 
 #include "gk20a.h"
 #include "gr_ctx_gk20a.h"
@@ -112,7 +111,7 @@ static bool gr_gk20a_is_firmware_defined(void)
 
 static int gr_gk20a_init_ctx_vars_fw(struct gk20a *g, struct gr_gk20a *gr)
 {
-        const struct firmware *netlist_fw;
+        struct nvgpu_firmware *netlist_fw;
         struct netlist_image *netlist = NULL;
         char name[MAX_NETLIST_NAME];
         u32 i, major_v = ~0, major_v_hw, netlist_num;
@@ -392,7 +391,7 @@ static int gr_gk20a_init_ctx_vars_fw(struct gk20a *g, struct gr_gk20a *gr)
                 g->gr.ctx_vars.valid = true;
                 g->gr.netlist = net;
 
-                release_firmware(netlist_fw);
+                nvgpu_release_firmware(g, netlist_fw);
                 gk20a_dbg_fn("done");
                 goto done;
 
@@ -427,7 +426,7 @@ clean_up:
                 nvgpu_kfree(g, g->gr.ctx_vars.ctxsw_regs.perf_pma.l);
                 nvgpu_kfree(g, g->gr.ctx_vars.ctxsw_regs.pm_rop.l);
                 nvgpu_kfree(g, g->gr.ctx_vars.ctxsw_regs.pm_ucgpc.l);
-                release_firmware(netlist_fw);
+                nvgpu_release_firmware(g, netlist_fw);
                 err = -ENOENT;
         }
 
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 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <linux/firmware.h>
 #include <trace/events/gk20a.h>
 
 #include <nvgpu/dma.h>
@@ -28,6 +27,7 @@
 #include <nvgpu/bsearch.h>
 #include <nvgpu/sort.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/firmware.h>
 
 #include "gk20a.h"
 #include "kind_gk20a.h"
@@ -2272,8 +2272,8 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g)
         struct vm_gk20a *vm = &mm->pmu.vm;
         struct gk20a_ctxsw_bootloader_desc *fecs_boot_desc;
         struct gk20a_ctxsw_bootloader_desc *gpccs_boot_desc;
-        const struct firmware *fecs_fw;
-        const struct firmware *gpccs_fw;
+        struct nvgpu_firmware *fecs_fw;
+        struct nvgpu_firmware *gpccs_fw;
         u32 *fecs_boot_image;
         u32 *gpccs_boot_image;
         struct gk20a_ctxsw_ucode_info *ucode_info = &g->ctxsw_ucode_info;
@@ -2292,7 +2292,7 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g)
 
         gpccs_fw = nvgpu_request_firmware(g, GK20A_GPCCS_UCODE_IMAGE, 0);
         if (!gpccs_fw) {
-                release_firmware(fecs_fw);
+                nvgpu_release_firmware(g, fecs_fw);
                 nvgpu_err(g, "failed to load gpccs ucode!!");
                 return -ENOENT;
         }
@@ -2321,7 +2321,7 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g)
                 g->gr.ctx_vars.ucode.fecs.inst.l,
                 g->gr.ctx_vars.ucode.fecs.data.l);
 
-        release_firmware(fecs_fw);
+        nvgpu_release_firmware(g, fecs_fw);
         fecs_fw = NULL;
 
         gr_gk20a_copy_ctxsw_ucode_segments(g, &ucode_info->surface_desc,
@@ -2330,7 +2330,7 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g)
                 g->gr.ctx_vars.ucode.gpccs.inst.l,
                 g->gr.ctx_vars.ucode.gpccs.data.l);
 
-        release_firmware(gpccs_fw);
+        nvgpu_release_firmware(g, gpccs_fw);
         gpccs_fw = NULL;
 
         err = gr_gk20a_init_ctxsw_ucode_vaspace(g);
@@ -2345,9 +2345,9 @@ int gr_gk20a_init_ctxsw_ucode(struct gk20a *g)
                         ucode_info->surface_desc.size, gk20a_mem_flag_none);
         nvgpu_dma_free(g, &ucode_info->surface_desc);
 
-        release_firmware(gpccs_fw);
+        nvgpu_release_firmware(g, gpccs_fw);
         gpccs_fw = NULL;
-        release_firmware(fecs_fw);
+        nvgpu_release_firmware(g, fecs_fw);
         fecs_fw = NULL;
 
         return err;
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 49b9e78d..0ca8851f 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/firmware.h>
 #include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
@@ -27,6 +26,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/firmware.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
@@ -3099,12 +3099,14 @@ static int pmu_queue_close(struct pmu_gk20a *pmu,
 
 void gk20a_remove_pmu_support(struct pmu_gk20a *pmu)
 {
+        struct gk20a *g = gk20a_from_pmu(pmu);
+
         gk20a_dbg_fn("");
 
         if (nvgpu_alloc_initialized(&pmu->dmem))
                 nvgpu_alloc_destroy(&pmu->dmem);
 
-        release_firmware(pmu->fw);
+        nvgpu_release_firmware(g, pmu->fw);
 
         nvgpu_mutex_destroy(&pmu->elpg_mutex);
         nvgpu_mutex_destroy(&pmu->pg_mutex);
@@ -3157,7 +3159,7 @@ static int gk20a_prepare_ucode(struct gk20a *g)
         return gk20a_init_pmu(pmu);
 
  err_release_fw:
-        release_firmware(pmu->fw);
+        nvgpu_release_firmware(g, pmu->fw);
         pmu->fw = NULL;
 
         return err;
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
index 84161304..e7a8b7c2 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
@@ -25,6 +25,8 @@
 #include <nvgpu/flcnif_cmn.h>
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 
+struct nvgpu_firmware;
+
 /* defined by pmu hw spec */
 #define GK20A_PMU_VA_SIZE               (512 * 1024 * 1024)
 #define GK20A_PMU_UCODE_SIZE_MAX        (256 * 1024)
@@ -394,7 +396,7 @@ struct pmu_gk20a {
         u32 aelpg_param[5];
         u32 override_done;
 
-        const struct firmware *fw;
+        struct nvgpu_firmware *fw;
 };
 
 int gk20a_init_pmu_support(struct gk20a *g);