diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.h | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index 9db18aa6..68f4eafa 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | |||
@@ -15,7 +15,6 @@ | |||
15 | 15 | ||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | 17 | ||
18 | #include "gp10b/mm_gp10b.h" | ||
19 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
20 | #include "gk20a/gk20a_allocator.h" | 19 | #include "gk20a/gk20a_allocator.h" |
21 | #include "gm20b/ltc_gm20b.h" | 20 | #include "gm20b/ltc_gm20b.h" |
@@ -113,14 +112,8 @@ static int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | |||
113 | if (err) | 112 | if (err) |
114 | return err; | 113 | return err; |
115 | 114 | ||
116 | #if NVGPU_USE_NEW_ALLOCATOR | ||
117 | __gk20a_allocator_init(&gr->comp_tags, NULL, "comptag", | 115 | __gk20a_allocator_init(&gr->comp_tags, NULL, "comptag", |
118 | 1, max_comptag_lines - 1, 1, 10, 0); | 116 | 1, max_comptag_lines - 1, 1, 10, 0); |
119 | #else | ||
120 | gk20a_allocator_init(&gr->comp_tags, "comptag", | ||
121 | 1, /* start */ | ||
122 | max_comptag_lines - 1); /* length*/ | ||
123 | #endif | ||
124 | 117 | ||
125 | gr->comptags_per_cacheline = comptags_per_cacheline; | 118 | gr->comptags_per_cacheline = comptags_per_cacheline; |
126 | gr->slices_per_ltc = slices_per_ltc; | 119 | gr->slices_per_ltc = slices_per_ltc; |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h index f34200a0..034944e0 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h | |||
@@ -14,16 +14,8 @@ | |||
14 | #ifndef MM_GP10B_H | 14 | #ifndef MM_GP10B_H |
15 | #define MM_GP10B_H | 15 | #define MM_GP10B_H |
16 | 16 | ||
17 | #include <linux/version.h> | ||
18 | |||
19 | #define NVGPU_MM_GET_IO_COHERENCE_BIT 35 | 17 | #define NVGPU_MM_GET_IO_COHERENCE_BIT 35 |
20 | 18 | ||
21 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) | ||
22 | #define NVGPU_USE_NEW_ALLOCATOR 1 | ||
23 | #else | ||
24 | #define NVGPU_USE_NEW_ALLOCATOR 0 | ||
25 | #endif | ||
26 | |||
27 | struct gpu_ops; | 19 | struct gpu_ops; |
28 | 20 | ||
29 | void gp10b_init_mm(struct gpu_ops *gops); | 21 | void gp10b_init_mm(struct gpu_ops *gops); |