summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-03-30 16:16:51 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-04 19:57:03 -0400
commitc86e940e1169be32e92297f6dfb07d0c2cade135 (patch)
tree86fc119bc20f6db09eda52ace9a2d76c6bf9ef53 /drivers/gpu/nvgpu/common
parente3bd4ae2a59fef37a85fbca168fc479dd5514023 (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/common')
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_channel.c2
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_tsg.c2
-rw-r--r--drivers/gpu/nvgpu/common/mm/lockless_allocator.c2
-rw-r--r--drivers/gpu/nvgpu/common/semaphore.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 722dad20..0d7c05de 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -712,7 +712,7 @@ static int gk20a_channel_event_id_enable(struct channel_gk20a *ch,
712 return 0; 712 return 0;
713 713
714clean_up_free: 714clean_up_free:
715 kfree(event_id_data); 715 nvgpu_kfree(g, event_id_data);
716clean_up_file: 716clean_up_file:
717 fput(file); 717 fput(file);
718clean_up: 718clean_up:
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
index 75231c71..c98d9873 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
@@ -161,7 +161,7 @@ static int gk20a_tsg_event_id_enable(struct tsg_gk20a *tsg,
161 return 0; 161 return 0;
162 162
163clean_up_free: 163clean_up_free:
164 kfree(event_id_data); 164 nvgpu_kfree(g, event_id_data);
165clean_up_file: 165clean_up_file:
166 fput(file); 166 fput(file);
167clean_up: 167clean_up:
diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
index 6fd9bc48..19368339 100644
--- a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
@@ -106,7 +106,7 @@ static void nvgpu_lockless_alloc_destroy(struct nvgpu_allocator *a)
106 106
107 nvgpu_fini_alloc_debug(a); 107 nvgpu_fini_alloc_debug(a);
108 108
109 vfree(pa->next); 109 nvgpu_vfree(a->g, pa->next);
110 nvgpu_kfree(nvgpu_alloc_to_gpu(a), pa); 110 nvgpu_kfree(nvgpu_alloc_to_gpu(a), pa);
111} 111}
112 112
diff --git a/drivers/gpu/nvgpu/common/semaphore.c b/drivers/gpu/nvgpu/common/semaphore.c
index 675794d1..5d526e64 100644
--- a/drivers/gpu/nvgpu/common/semaphore.c
+++ b/drivers/gpu/nvgpu/common/semaphore.c
@@ -74,7 +74,7 @@ void gk20a_semaphore_sea_destroy(struct gk20a *g)
74 return; 74 return;
75 75
76 nvgpu_mutex_destroy(&g->sema_sea->sea_lock); 76 nvgpu_mutex_destroy(&g->sema_sea->sea_lock);
77 kfree(g->sema_sea); 77 nvgpu_kfree(g, g->sema_sea);
78 g->sema_sea = NULL; 78 g->sema_sea = NULL;
79} 79}
80 80