gpu: nvgpu: Use new kmem API functions (gm20b/*)

Use the new kmem API functions in gm20b/*. Also add a struct gk20a
pointer to

  lsfm_free_ucode_img_res()
  lsfm_free_nonpmu_ucode_img_res()

so nvgpu_kfree() works.

Bug 1799159
Bug 1823380

Change-Id: I3373600455553710adb14e0fb5743bf197095a03
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1318320
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 5b5fa82c..4f4b8d4a 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -22,6 +22,8 @@
 
 #include <dt-bindings/soc/gm20b-fuse.h>
 
+#include <nvgpu/kmem.h>
+
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
@@ -593,7 +595,7 @@ static int gr_gm20b_load_smid_config(struct gk20a *g)
         u32 i, j;
         u32 tpc_index, gpc_index;
 
-        tpc_sm_id = kcalloc(gr_cwd_sm_id__size_1_v(), sizeof(u32), GFP_KERNEL);
+        tpc_sm_id = nvgpu_kcalloc(g, gr_cwd_sm_id__size_1_v(), sizeof(u32));
         if (!tpc_sm_id)
                 return -ENOMEM;
 
@@ -625,7 +627,7 @@ static int gr_gm20b_load_smid_config(struct gk20a *g)
         for (i = 0; i < gr_cwd_sm_id__size_1_v(); i++)
                 gk20a_writel(g, gr_cwd_sm_id_r(i), tpc_sm_id[i]);
 
-        kfree(tpc_sm_id);
+        nvgpu_kfree(g, tpc_sm_id);
 
         return 0;
 }
@@ -1420,7 +1422,7 @@ static int gm20b_gr_fuse_override(struct gk20a *g)
         if (count <= 0)
                 return count;
 
-        fuses = kmalloc(sizeof(u32) * count * 2, GFP_KERNEL);
+        fuses = nvgpu_kmalloc(g, sizeof(u32) * count * 2);
         if (!fuses)
                 return -ENOMEM;
         of_property_read_u32_array(np, "fuse-overrides", fuses, count * 2);
@@ -1440,7 +1442,7 @@ static int gm20b_gr_fuse_override(struct gk20a *g)
                 }
         }
 
-        kfree(fuses);
+        nvgpu_kfree(g, fuses);
         return 0;
 }