From 6be166affaead22bee860e09b2aeb24548f08864 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 6 Nov 2018 14:49:54 -0800 Subject: [PATCH] gpu: nvgpu: Add new subdirs to common/mm Add two new sub-directories under MM: gmmu and allocators. The allocators directory is for all the allocator code we have. There's a fair amount and as such could be considered a component with a bunch of sub-units. The new GMMU directory will contain the GMMU component (which used to be a single unit). The new GMMU component is comprised of the page_table and pd_cache units. Also when we migrate the chip specific GMMU code out of mm_gk20a.c and mm_gp10b.c it will be placed in this new GMMU directory. JIRA NVGPU-1390 Change-Id: I7aa47ea2a32612b7d69972671fccb72770e1ae09 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1944385 Reviewed-by: Nicolas Benech GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 14 +++++++------- drivers/gpu/nvgpu/Makefile.sources | 14 +++++++------- .../common/mm/{ => allocators}/bitmap_allocator.c | 0 .../mm/{ => allocators}/bitmap_allocator_priv.h | 0 .../common/mm/{ => allocators}/buddy_allocator.c | 0 .../mm/{ => allocators}/buddy_allocator_priv.h | 0 .../mm/{ => allocators}/lockless_allocator.c | 0 .../mm/{ => allocators}/lockless_allocator_priv.h | 0 .../common/mm/{ => allocators}/nvgpu_allocator.c | 0 .../common/mm/{ => allocators}/page_allocator.c | 0 .../nvgpu/common/mm/{gmmu.c => gmmu/page_table.c} | 0 drivers/gpu/nvgpu/common/mm/{ => gmmu}/pd_cache.c | 0 12 files changed, 14 insertions(+), 14 deletions(-) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/bitmap_allocator.c (100%) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/bitmap_allocator_priv.h (100%) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/buddy_allocator.c (100%) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/buddy_allocator_priv.h (100%) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/lockless_allocator.c (100%) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/lockless_allocator_priv.h (100%) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/nvgpu_allocator.c (100%) rename drivers/gpu/nvgpu/common/mm/{ => allocators}/page_allocator.c (100%) rename drivers/gpu/nvgpu/common/mm/{gmmu.c => gmmu/page_table.c} (100%) rename drivers/gpu/nvgpu/common/mm/{ => gmmu}/pd_cache.c (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index d1536395a..62b03dcf2 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -210,13 +210,13 @@ nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \ endif nvgpu-y += \ - 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 \ - common/mm/gmmu.o \ - common/mm/pd_cache.o \ + common/mm/allocators/nvgpu_allocator.o \ + common/mm/allocators/bitmap_allocator.o \ + common/mm/allocators/buddy_allocator.o \ + common/mm/allocators/page_allocator.o \ + common/mm/allocators/lockless_allocator.o \ + common/mm/gmmu/page_table.o \ + common/mm/gmmu/pd_cache.o \ common/mm/vm.o \ common/mm/vm_area.o \ common/mm/nvgpu_mem.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 7afe388aa..5a90d5640 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -46,13 +46,13 @@ srcs := os/posix/nvgpu.c \ os/posix/stubs.c \ os/posix/posix-fault-injection.c \ os/posix/gk20a.c \ - common/mm/nvgpu_allocator.c \ - common/mm/bitmap_allocator.c \ - common/mm/buddy_allocator.c \ - common/mm/page_allocator.c \ - common/mm/lockless_allocator.c \ - common/mm/gmmu.c \ - common/mm/pd_cache.c \ + common/mm/allocators/nvgpu_allocator.c \ + common/mm/allocators/bitmap_allocator.c \ + common/mm/allocators/buddy_allocator.c \ + common/mm/allocators/page_allocator.c \ + common/mm/allocators/lockless_allocator.c \ + common/mm/gmmu/page_table.c \ + common/mm/gmmu/pd_cache.c \ common/mm/vm.c \ common/mm/vm_area.c \ common/mm/nvgpu_mem.c \ diff --git a/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator.c similarity index 100% rename from drivers/gpu/nvgpu/common/mm/bitmap_allocator.c rename to drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator.c diff --git a/drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h b/drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator_priv.h similarity index 100% rename from drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h rename to drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator_priv.h diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator.c similarity index 100% rename from drivers/gpu/nvgpu/common/mm/buddy_allocator.c rename to drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator.c diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator_priv.h b/drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator_priv.h similarity index 100% rename from drivers/gpu/nvgpu/common/mm/buddy_allocator_priv.h rename to drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator_priv.h diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator.c similarity index 100% rename from drivers/gpu/nvgpu/common/mm/lockless_allocator.c rename to drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator.c diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator_priv.h b/drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator_priv.h similarity index 100% rename from drivers/gpu/nvgpu/common/mm/lockless_allocator_priv.h rename to drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator_priv.h diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c similarity index 100% rename from drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c rename to drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c diff --git a/drivers/gpu/nvgpu/common/mm/page_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c similarity index 100% rename from drivers/gpu/nvgpu/common/mm/page_allocator.c rename to drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu/page_table.c similarity index 100% rename from drivers/gpu/nvgpu/common/mm/gmmu.c rename to drivers/gpu/nvgpu/common/mm/gmmu/page_table.c diff --git a/drivers/gpu/nvgpu/common/mm/pd_cache.c b/drivers/gpu/nvgpu/common/mm/gmmu/pd_cache.c similarity index 100% rename from drivers/gpu/nvgpu/common/mm/pd_cache.c rename to drivers/gpu/nvgpu/common/mm/gmmu/pd_cache.c