diff options
author | Bharat Nihalani <bnihalani@nvidia.com> | 2015-06-04 08:08:59 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-06-04 13:41:00 -0400 |
commit | b8aa486109a43a8c92159b0845a4adc9f6a84654 (patch) | |
tree | 9086e63713df6a63d4ad152503c49e238d23c7d3 /drivers/gpu/nvgpu/gm20b | |
parent | 56d7896731c91595db3205777f308fbcaeac7340 (diff) |
Revert "Revert "Revert "Revert "gpu: nvgpu: New allocator for VA space""""
This reverts commit 2e5803d0f2b7d7a1577a40f45ab9f3b22ef2df80 since
the issue seen with bug 200106514 is fixed with change
http://git-master/r/#/c/752080/.
Bug 200112195
Change-Id: I588151c2a7ea74bd89dc3fd48bb81ff2c49f5a0a
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/752503
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-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; |