From b44c7fdb114a63ab98fffc0f246776b56399ff64 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 14 Aug 2018 11:30:48 -0700 Subject: gpu: nvgpu: Move common DMA code to common/mm This migrates the common DMA code (os agnostic) to the common directory. This new unit will be the common DMA allocator that lets users allocate SYSMEM, VIDMEM, or either. Other units will be responsible for actually handling the mechanics of allocating VIDMEM or SYSMEM. Also update the names of the DMA related files so that tmake doesn't complain about duplicate C file names. To do this call the common DMA file dma.c and prepend the OS to the other DMA files. So now we have: common/mm/dma.c os/posix/posix-dma.c os/linux/linux-dma.c JIRA NVGPU-990 Change-Id: I22d2d41803ad89be7d9c28f87864ce4fedf10836 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1799807 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/Makefile') diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 43a36221..a3372cef 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -65,7 +65,7 @@ nvgpu-y += \ os/linux/log.o \ os/linux/cond.o \ os/linux/nvgpu_mem.o \ - os/linux/dma.o \ + os/linux/linux-dma.o \ os/linux/driver_common.o \ os/linux/firmware.o \ os/linux/thread.o \ @@ -180,6 +180,7 @@ nvgpu-y += \ common/mm/nvgpu_mem.o \ common/mm/comptags.o \ common/mm/mm.o \ + common/mm/dma.o \ common/enabled.o \ common/nvlink.o \ common/pramin.o \ -- cgit v1.2.2