From dfe6493dcba650318275b73e62fe2e5d35b36622 Mon Sep 17 00:00:00 2001 From: Bharat Nihalani Date: Thu, 4 Jun 2015 05:11:04 -0700 Subject: 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 Reviewed-on: http://git-master/r/752504 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/ltc_gp10b.c') 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 -#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; -- cgit v1.2.2