diff options
author | Alex Waterman <alexw@nvidia.com> | 2015-05-15 12:13:28 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-05-19 16:09:00 -0400 |
commit | 01f359f3f1bbf95d7ac4453a6c1de811bf0aee11 (patch) | |
tree | c35c928fcacaae7be13b4601538032dae9f672c6 /drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |
parent | 7ddd6e261ed620dbb388202be89ca4e6843e3947 (diff) |
Revert "Revert "gpu: nvgpu: New allocator for VA space""
This reverts commit 7eb42bc239dbd207208ff491c3fb65c3d83274d8.
The original commit was actually fine.
Change-Id: I564ce6530ac73fcfad17dcec9c53f0353b4f02d4
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/743300
(cherry picked from commit e99aa2485f8992eabe3556f3ebcb57bdc8ad91ff)
Reviewed-on: http://git-master/r/743301
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/ltc_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 9d16dba7..bc904ef3 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -90,9 +90,8 @@ static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | |||
90 | if (err) | 90 | if (err) |
91 | return err; | 91 | return err; |
92 | 92 | ||
93 | gk20a_allocator_init(&gr->comp_tags, "comptag", | 93 | __gk20a_allocator_init(&gr->comp_tags, NULL, "comptag", |
94 | 1, /* start */ | 94 | 1, max_comptag_lines - 1, 1, 10, 0); |
95 | max_comptag_lines - 1); /* length*/ | ||
96 | 95 | ||
97 | gr->comptags_per_cacheline = comptags_per_cacheline; | 96 | gr->comptags_per_cacheline = comptags_per_cacheline; |
98 | gr->slices_per_ltc = slices_per_ltc; | 97 | gr->slices_per_ltc = slices_per_ltc; |