diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-12-20 16:55:48 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-01-09 15:33:16 -0500 |
commit | 6df3992b60959d32c7113cb77e131a2547174f3a (patch) | |
tree | efbdc9e6ccd2330d5c469ca0783ecb0137da8fc4 /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | e229514bece5a109cdbfe263f6329efe987e5939 (diff) |
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 <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1274400
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index b1e90bd8..753f031a 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -43,6 +43,8 @@ | |||
43 | #include <linux/sched.h> | 43 | #include <linux/sched.h> |
44 | #include <linux/version.h> | 44 | #include <linux/version.h> |
45 | 45 | ||
46 | #include <nvgpu/allocator.h> | ||
47 | |||
46 | #include "gk20a.h" | 48 | #include "gk20a.h" |
47 | #include "nvgpu_common.h" | 49 | #include "nvgpu_common.h" |
48 | #include "debug_gk20a.h" | 50 | #include "debug_gk20a.h" |
@@ -60,7 +62,6 @@ | |||
60 | #include "gk20a_scale.h" | 62 | #include "gk20a_scale.h" |
61 | #include "ctxsw_trace_gk20a.h" | 63 | #include "ctxsw_trace_gk20a.h" |
62 | #include "dbg_gpu_gk20a.h" | 64 | #include "dbg_gpu_gk20a.h" |
63 | #include "gk20a_allocator.h" | ||
64 | #include "hal.h" | 65 | #include "hal.h" |
65 | #include "vgpu/vgpu.h" | 66 | #include "vgpu/vgpu.h" |
66 | #include "pci.h" | 67 | #include "pci.h" |