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

Use the new kmem API functions in vgpu/*. Also reshuffle the order
of some allocs in the vgpu init code to allow usage of the nvgpu
kmem APIs.

Bug 1799159
Bug 1823380

Change-Id: I6c6dcff03b406a260dffbf89a59b368d31a4cb2c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1318318
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c
index 6396ee4c..398e26b2 100644
--- a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c
@@ -16,6 +16,8 @@
 #include <linux/tegra_vgpu.h>
 #include <linux/version.h>
 
+#include <nvgpu/kmem.h>
+
 #include "gk20a/gk20a.h"
 #include "gk20a/ctxsw_trace_gk20a.h"
 #include "vgpu.h"
@@ -42,7 +44,7 @@ static int vgpu_fecs_trace_init(struct gk20a *g)
 
         gk20a_dbg_fn("");
 
-        vcst = kzalloc(sizeof(*vcst), GFP_KERNEL);
+        vcst = nvgpu_kzalloc(g, sizeof(*vcst));
         if (!vcst)
                 return -ENOMEM;
 
@@ -91,7 +93,7 @@ fail:
         iounmap(vcst->buf);
         if (vcst->cookie)
                 tegra_hv_mempool_unreserve(vcst->cookie);
-        kfree(vcst);
+        nvgpu_kfree(g, vcst);
         return err;
 }
 
@@ -101,7 +103,7 @@ static int vgpu_fecs_trace_deinit(struct gk20a *g)
 
         iounmap(vcst->buf);
         tegra_hv_mempool_unreserve(vcst->cookie);
-        kfree(vcst);
+        nvgpu_kfree(g, vcst);
         return 0;
 }