From 6df3992b60959d32c7113cb77e131a2547174f3a Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 20 Dec 2016 13:55:48 -0800 Subject: gpu: nvgpu: Move allocators to common/mm/ Move the GPU allocators to common/mm/ since the allocators are common code across all GPUs. Also rename the allocator code to move away from gk20a_ prefixed structs and functions. This caused one issue with the nvgpu_alloc() and nvgpu_free() functions. There was a function for allocating either with kmalloc() or vmalloc() depending on the size of the allocation. Those have now been renamed to nvgpu_kalloc() and nvgpu_kfree(). Bug 1799159 Change-Id: Iddda92c013612bcb209847084ec85b8953002fa5 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1274400 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.nvgpu | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/Makefile.nvgpu') diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu index 93629eff..afce062b 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu +++ b/drivers/gpu/nvgpu/Makefile.nvgpu @@ -23,6 +23,11 @@ obj-$(CONFIG_GK20A) := nvgpu.o nvgpu-y := \ common/linux/timers.o \ + common/mm/nvgpu_allocator.o \ + common/mm/bitmap_allocator.o \ + common/mm/buddy_allocator.o \ + common/mm/page_allocator.o \ + common/mm/lockless_allocator.o \ nvgpu_common.o \ gk20a/gk20a.o \ gk20a/sched_gk20a.o \ @@ -51,11 +56,6 @@ nvgpu-y := \ gk20a/fb_gk20a.o \ gk20a/hal.o \ gk20a/hal_gk20a.o \ - gk20a/gk20a_allocator.o \ - gk20a/gk20a_allocator_bitmap.o \ - gk20a/gk20a_allocator_buddy.o \ - gk20a/gk20a_allocator_page.o \ - gk20a/gk20a_allocator_lockless.o \ gk20a/cde_gk20a.o \ gk20a/platform_gk20a_generic.o \ gk20a/tsg_gk20a.o \ -- cgit v1.2.2