From 3ab4a992e10cd0a312a865a4937b90162978356c Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 8 Mar 2017 16:58:49 -0800 Subject: gpu: nvgpu: Use new kmem API functions (gp10b/*) Use the new kmem API functions in gp10b/*. Bug 1799159 Bug 1823380 Change-Id: Ia643c704aca2e23e3762c9b7dbdf1aa1f2363811 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1318309 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/gr_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 4898502d..6de6b599 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c @@ -21,6 +21,9 @@ #include #include +#include +#include + #include "gk20a/gk20a.h" #include "gk20a/gr_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" @@ -29,8 +32,6 @@ #include "gp10b/gr_gp10b.h" #include "gp10b_sysfs.h" -#include - #include #include #include @@ -1479,7 +1480,7 @@ static int gr_gp10b_load_smid_config(struct gk20a *g) u32 tpc_index, gpc_index; u32 max_gpcs = nvgpu_get_litter_value(g, GPU_LIT_NUM_GPCS); - 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; @@ -1512,7 +1513,7 @@ static int gr_gp10b_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; } @@ -2224,7 +2225,7 @@ static int gp10b_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); @@ -2247,7 +2248,7 @@ static int gp10b_gr_fuse_override(struct gk20a *g) } } - kfree(fuses); + nvgpu_kfree(g, fuses); return 0; } -- cgit v1.2.2