diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-03-08 19:58:49 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-22 21:37:04 -0400 |
commit | 3ab4a992e10cd0a312a865a4937b90162978356c (patch) | |
tree | 1c9ea14f6aa9b846d1c800f77efa4d1cdcc86eb5 /drivers/gpu/nvgpu/gp10b | |
parent | dd947aeec4d2b1c043202c87377d10b2e31311f9 (diff) |
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 <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1318309
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 13 |
1 files changed, 7 insertions, 6 deletions
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 @@ | |||
21 | #include <dt-bindings/soc/gm20b-fuse.h> | 21 | #include <dt-bindings/soc/gm20b-fuse.h> |
22 | #include <dt-bindings/soc/gp10b-fuse.h> | 22 | #include <dt-bindings/soc/gp10b-fuse.h> |
23 | 23 | ||
24 | #include <nvgpu/timers.h> | ||
25 | #include <nvgpu/kmem.h> | ||
26 | |||
24 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
25 | #include "gk20a/gr_gk20a.h" | 28 | #include "gk20a/gr_gk20a.h" |
26 | #include "gk20a/dbg_gpu_gk20a.h" | 29 | #include "gk20a/dbg_gpu_gk20a.h" |
@@ -29,8 +32,6 @@ | |||
29 | #include "gp10b/gr_gp10b.h" | 32 | #include "gp10b/gr_gp10b.h" |
30 | #include "gp10b_sysfs.h" | 33 | #include "gp10b_sysfs.h" |
31 | 34 | ||
32 | #include <nvgpu/timers.h> | ||
33 | |||
34 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | 35 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> |
35 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> | 36 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> |
36 | #include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h> | 37 | #include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h> |
@@ -1479,7 +1480,7 @@ static int gr_gp10b_load_smid_config(struct gk20a *g) | |||
1479 | u32 tpc_index, gpc_index; | 1480 | u32 tpc_index, gpc_index; |
1480 | u32 max_gpcs = nvgpu_get_litter_value(g, GPU_LIT_NUM_GPCS); | 1481 | u32 max_gpcs = nvgpu_get_litter_value(g, GPU_LIT_NUM_GPCS); |
1481 | 1482 | ||
1482 | tpc_sm_id = kcalloc(gr_cwd_sm_id__size_1_v(), sizeof(u32), GFP_KERNEL); | 1483 | tpc_sm_id = nvgpu_kcalloc(g, gr_cwd_sm_id__size_1_v(), sizeof(u32)); |
1483 | if (!tpc_sm_id) | 1484 | if (!tpc_sm_id) |
1484 | return -ENOMEM; | 1485 | return -ENOMEM; |
1485 | 1486 | ||
@@ -1512,7 +1513,7 @@ static int gr_gp10b_load_smid_config(struct gk20a *g) | |||
1512 | for (i = 0; i < gr_cwd_sm_id__size_1_v(); i++) | 1513 | for (i = 0; i < gr_cwd_sm_id__size_1_v(); i++) |
1513 | gk20a_writel(g, gr_cwd_sm_id_r(i), tpc_sm_id[i]); | 1514 | gk20a_writel(g, gr_cwd_sm_id_r(i), tpc_sm_id[i]); |
1514 | 1515 | ||
1515 | kfree(tpc_sm_id); | 1516 | nvgpu_kfree(g, tpc_sm_id); |
1516 | 1517 | ||
1517 | return 0; | 1518 | return 0; |
1518 | } | 1519 | } |
@@ -2224,7 +2225,7 @@ static int gp10b_gr_fuse_override(struct gk20a *g) | |||
2224 | if (count <= 0) | 2225 | if (count <= 0) |
2225 | return count; | 2226 | return count; |
2226 | 2227 | ||
2227 | fuses = kmalloc(sizeof(u32) * count * 2, GFP_KERNEL); | 2228 | fuses = nvgpu_kmalloc(g, sizeof(u32) * count * 2); |
2228 | if (!fuses) | 2229 | if (!fuses) |
2229 | return -ENOMEM; | 2230 | return -ENOMEM; |
2230 | of_property_read_u32_array(np, "fuse-overrides", fuses, count * 2); | 2231 | of_property_read_u32_array(np, "fuse-overrides", fuses, count * 2); |
@@ -2247,7 +2248,7 @@ static int gp10b_gr_fuse_override(struct gk20a *g) | |||
2247 | } | 2248 | } |
2248 | } | 2249 | } |
2249 | 2250 | ||
2250 | kfree(fuses); | 2251 | nvgpu_kfree(g, fuses); |
2251 | 2252 | ||
2252 | return 0; | 2253 | return 0; |
2253 | } | 2254 | } |