diff options
author | Bharat Nihalani <bnihalani@nvidia.com> | 2015-06-04 08:11:04 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:52:06 -0500 |
commit | dfe6493dcba650318275b73e62fe2e5d35b36622 (patch) | |
tree | ebb4cf8e04421719e368f31bb525b8269870d168 /drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | |
parent | c25a2ac26e11057c1bef0da7b4a661247817140f (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/ltc_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 7 |
1 files changed, 0 insertions, 7 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; |