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/vgpu/ltc_vgpu.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/vgpu/ltc_vgpu.c')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/ltc_vgpu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c b/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c index 1beac216..211e34b5 100644 --- a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c | |||
@@ -41,9 +41,8 @@ static int vgpu_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | |||
41 | if (max_comptag_lines < 2) | 41 | if (max_comptag_lines < 2) |
42 | return -ENXIO; | 42 | return -ENXIO; |
43 | 43 | ||
44 | gk20a_allocator_init(&gr->comp_tags, "comptag", | 44 | __gk20a_allocator_init(&gr->comp_tags, NULL, "comptag", |
45 | 1, /* start */ | 45 | 1, max_comptag_lines - 1, 1, 10, 0); /* length*/ |
46 | max_comptag_lines - 1); /* length*/ | ||
47 | return 0; | 46 | return 0; |
48 | } | 47 | } |
49 | 48 | ||