diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-03-30 16:16:51 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-04 19:57:03 -0400 |
commit | c86e940e1169be32e92297f6dfb07d0c2cade135 (patch) | |
tree | 86fc119bc20f6db09eda52ace9a2d76c6bf9ef53 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | e3bd4ae2a59fef37a85fbca168fc479dd5514023 (diff) |
gpu: nvgpu: Remove last Linux kmem usage
Replace the last of the Linux kmem API usage with nvgpu kmem
calls instead. Several places are left alone - allocating the
struct gk20a in particular.
Also one function was updated in the clk code to take a struct
gk20a as an argument so that it could use nvgpu_kmalloc().
Bug 1799159
Bug 1823380
Change-Id: I84fc3f8e19c63d6265bac6098dc727d93e3ff613
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1331702
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index f7f39207..b2a6b1a0 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -3489,8 +3489,8 @@ static void __gk20a_fifo_profile_free(struct kref *ref) | |||
3489 | { | 3489 | { |
3490 | struct fifo_gk20a *f = container_of(ref, struct fifo_gk20a, | 3490 | struct fifo_gk20a *f = container_of(ref, struct fifo_gk20a, |
3491 | profile.ref); | 3491 | profile.ref); |
3492 | vfree(f->profile.data); | 3492 | nvgpu_vfree(f->g, f->profile.data); |
3493 | vfree(f->profile.sorted); | 3493 | nvgpu_vfree(f->g, f->profile.sorted); |
3494 | } | 3494 | } |
3495 | 3495 | ||
3496 | static int gk20a_fifo_profile_enable(void *data, u64 val) | 3496 | static int gk20a_fifo_profile_enable(void *data, u64 val) |
@@ -3518,8 +3518,8 @@ static int gk20a_fifo_profile_enable(void *data, u64 val) | |||
3518 | FIFO_PROFILING_ENTRIES * | 3518 | FIFO_PROFILING_ENTRIES * |
3519 | sizeof(u64)); | 3519 | sizeof(u64)); |
3520 | if (!(f->profile.data && f->profile.sorted)) { | 3520 | if (!(f->profile.data && f->profile.sorted)) { |
3521 | vfree(f->profile.data); | 3521 | nvgpu_vfree(g, f->profile.data); |
3522 | vfree(f->profile.sorted); | 3522 | nvgpu_vfree(g, f->profile.sorted); |
3523 | nvgpu_mutex_release(&f->profile.lock); | 3523 | nvgpu_mutex_release(&f->profile.lock); |
3524 | return -ENOMEM; | 3524 | return -ENOMEM; |
3525 | } | 3525 | } |