Revert "gpu: nvgpu: fix allocator_init() calls"

This reverts commit 053037f1450d6ba6c5d01abcdcd9b24019ae8c85
since the issue seen with bug 200106514 is fixed with change
http://git-master/r/#/c/752080/.

Bug 200112195

Change-Id: If54eb570fd2ad5de99d180d03d5d90492283fe33
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/752504
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

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 @@
 
 #include <linux/types.h>
 
-#include "gp10b/mm_gp10b.h"
 #include "gk20a/gk20a.h"
 #include "gk20a/gk20a_allocator.h"
 #include "gm20b/ltc_gm20b.h"
@@ -113,14 +112,8 @@ static int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         if (err)
                 return err;
 
-#if NVGPU_USE_NEW_ALLOCATOR
         __gk20a_allocator_init(&gr->comp_tags, NULL, "comptag",
                                1, max_comptag_lines - 1, 1, 10, 0);
-#else
-        gk20a_allocator_init(&gr->comp_tags, "comptag",
-                                1, /* start */
-                                max_comptag_lines - 1); /* length*/
-#endif
 
         gr->comptags_per_cacheline = comptags_per_cacheline;
         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 @@
 #ifndef MM_GP10B_H
 #define MM_GP10B_H
 
-#include <linux/version.h>
-
 #define NVGPU_MM_GET_IO_COHERENCE_BIT   35
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-#define NVGPU_USE_NEW_ALLOCATOR 1
-#else
-#define NVGPU_USE_NEW_ALLOCATOR 0
-#endif
-
 struct gpu_ops;
 
 void gp10b_init_mm(struct gpu_ops *gops);