From 2e15a2d1accb8303c2363122c638e08ae7b70a50 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 8 Mar 2017 16:58:25 -0800 Subject: 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 Reviewed-on: http://git-master/r/1318318 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c') 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 #include +#include + #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; } -- cgit v1.2.2