diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/comptags.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/gmmu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/mm.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/pd_cache.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vidmem.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vm.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vm_area.c | 2 |
9 files changed, 9 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/comptags.c b/drivers/gpu/nvgpu/common/mm/comptags.c index f6216648..cb0184c7 100644 --- a/drivers/gpu/nvgpu/common/mm/comptags.c +++ b/drivers/gpu/nvgpu/common/mm/comptags.c | |||
@@ -23,8 +23,7 @@ | |||
23 | #include <nvgpu/bug.h> | 23 | #include <nvgpu/bug.h> |
24 | #include <nvgpu/bitops.h> | 24 | #include <nvgpu/bitops.h> |
25 | #include <nvgpu/comptags.h> | 25 | #include <nvgpu/comptags.h> |
26 | 26 | #include <nvgpu/gk20a.h> | |
27 | #include "gk20a/gk20a.h" | ||
28 | 27 | ||
29 | int gk20a_comptaglines_alloc(struct gk20a_comptag_allocator *allocator, | 28 | int gk20a_comptaglines_alloc(struct gk20a_comptag_allocator *allocator, |
30 | u32 *offset, u32 len) | 29 | u32 *offset, u32 len) |
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c index 02e32b20..afbad75c 100644 --- a/drivers/gpu/nvgpu/common/mm/gmmu.c +++ b/drivers/gpu/nvgpu/common/mm/gmmu.c | |||
@@ -32,8 +32,8 @@ | |||
32 | #include <nvgpu/vidmem.h> | 32 | #include <nvgpu/vidmem.h> |
33 | #include <nvgpu/sizes.h> | 33 | #include <nvgpu/sizes.h> |
34 | #include <nvgpu/types.h> | 34 | #include <nvgpu/types.h> |
35 | #include <nvgpu/gk20a.h> | ||
35 | 36 | ||
36 | #include "gk20a/gk20a.h" | ||
37 | #include "gk20a/mm_gk20a.h" | 37 | #include "gk20a/mm_gk20a.h" |
38 | 38 | ||
39 | #define __gmmu_dbg(g, attrs, fmt, args...) \ | 39 | #define __gmmu_dbg(g, attrs, fmt, args...) \ |
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c index 6c8f2cdf..58a435c0 100644 --- a/drivers/gpu/nvgpu/common/mm/mm.c +++ b/drivers/gpu/nvgpu/common/mm/mm.c | |||
@@ -29,8 +29,7 @@ | |||
29 | #include <nvgpu/semaphore.h> | 29 | #include <nvgpu/semaphore.h> |
30 | #include <nvgpu/pramin.h> | 30 | #include <nvgpu/pramin.h> |
31 | #include <nvgpu/enabled.h> | 31 | #include <nvgpu/enabled.h> |
32 | 32 | #include <nvgpu/gk20a.h> | |
33 | #include "gk20a/gk20a.h" | ||
34 | 33 | ||
35 | /* | 34 | /* |
36 | * Attempt to find a reserved memory area to determine PTE size for the passed | 35 | * Attempt to find a reserved memory area to determine PTE size for the passed |
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c index 68d68ad6..c49dcfd2 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | |||
@@ -23,8 +23,8 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/allocator.h> | 25 | #include <nvgpu/allocator.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gk20a/mm_gk20a.h" | 28 | #include "gk20a/mm_gk20a.h" |
29 | 29 | ||
30 | u64 nvgpu_alloc_length(struct nvgpu_allocator *a) | 30 | u64 nvgpu_alloc_length(struct nvgpu_allocator *a) |
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c index 5cfaded0..8f6bd66e 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | |||
@@ -25,9 +25,7 @@ | |||
25 | #include <nvgpu/nvgpu_mem.h> | 25 | #include <nvgpu/nvgpu_mem.h> |
26 | #include <nvgpu/dma.h> | 26 | #include <nvgpu/dma.h> |
27 | #include <nvgpu/vidmem.h> | 27 | #include <nvgpu/vidmem.h> |
28 | 28 | #include <nvgpu/gk20a.h> | |
29 | #include "gk20a/gk20a.h" | ||
30 | |||
31 | /* | 29 | /* |
32 | * Make sure to use the right coherency aperture if you use this function! This | 30 | * Make sure to use the right coherency aperture if you use this function! This |
33 | * will not add any checks. If you want to simply use the default coherency then | 31 | * will not add any checks. If you want to simply use the default coherency then |
diff --git a/drivers/gpu/nvgpu/common/mm/pd_cache.c b/drivers/gpu/nvgpu/common/mm/pd_cache.c index a8ed10e7..d9dc3db0 100644 --- a/drivers/gpu/nvgpu/common/mm/pd_cache.c +++ b/drivers/gpu/nvgpu/common/mm/pd_cache.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/nvgpu_mem.h> | 27 | #include <nvgpu/nvgpu_mem.h> |
28 | #include <nvgpu/list.h> | 28 | #include <nvgpu/list.h> |
29 | #include <nvgpu/log2.h> | 29 | #include <nvgpu/log2.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/mm_gk20a.h" | 32 | #include "gk20a/mm_gk20a.h" |
33 | 33 | ||
34 | #define pd_dbg(g, fmt, args...) nvgpu_log(g, gpu_dbg_pd_cache, fmt, ##args) | 34 | #define pd_dbg(g, fmt, args...) nvgpu_log(g, gpu_dbg_pd_cache, fmt, ##args) |
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c index 3f5e0fbb..06cf053b 100644 --- a/drivers/gpu/nvgpu/common/mm/vidmem.c +++ b/drivers/gpu/nvgpu/common/mm/vidmem.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/page_allocator.h> | 27 | #include <nvgpu/page_allocator.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/sizes.h> | 29 | #include <nvgpu/sizes.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/mm_gk20a.h" | 32 | #include "gk20a/mm_gk20a.h" |
33 | #include "gk20a/fence_gk20a.h" | 33 | #include "gk20a/fence_gk20a.h" |
34 | 34 | ||
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c index 33587e5d..1e6c4601 100644 --- a/drivers/gpu/nvgpu/common/mm/vm.c +++ b/drivers/gpu/nvgpu/common/mm/vm.c | |||
@@ -34,10 +34,9 @@ | |||
34 | #include <nvgpu/enabled.h> | 34 | #include <nvgpu/enabled.h> |
35 | #include <nvgpu/sizes.h> | 35 | #include <nvgpu/sizes.h> |
36 | #include <nvgpu/timers.h> | 36 | #include <nvgpu/timers.h> |
37 | 37 | #include <nvgpu/gk20a.h> | |
38 | #include <nvgpu/vgpu/vm.h> | 38 | #include <nvgpu/vgpu/vm.h> |
39 | 39 | ||
40 | #include "gk20a/gk20a.h" | ||
41 | #include "gk20a/mm_gk20a.h" | 40 | #include "gk20a/mm_gk20a.h" |
42 | 41 | ||
43 | struct nvgpu_ctag_buffer_info { | 42 | struct nvgpu_ctag_buffer_info { |
diff --git a/drivers/gpu/nvgpu/common/mm/vm_area.c b/drivers/gpu/nvgpu/common/mm/vm_area.c index ac4708af..363995fb 100644 --- a/drivers/gpu/nvgpu/common/mm/vm_area.c +++ b/drivers/gpu/nvgpu/common/mm/vm_area.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <nvgpu/vm.h> | 23 | #include <nvgpu/vm.h> |
24 | #include <nvgpu/vm_area.h> | 24 | #include <nvgpu/vm_area.h> |
25 | #include <nvgpu/barrier.h> | 25 | #include <nvgpu/barrier.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gk20a/mm_gk20a.h" | 28 | #include "gk20a/mm_gk20a.h" |
29 | 29 | ||
30 | struct nvgpu_vm_area *nvgpu_vm_area_find(struct vm_gk20a *vm, u64 addr) | 30 | struct nvgpu_vm_area *nvgpu_vm_area_find(struct vm_gk20a *vm, u64 addr) |