summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2015-05-15 12:16:58 -0400
committerDeepak Nibade <dnibade@nvidia.com>2016-12-27 04:52:05 -0500
commit2907e24e8bb31f41d13692aef76aa7c0ca227525 (patch)
tree1a028ae508a8afaa3ce91361f38f50dfb2c241ad /drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
parent5e18ae63dbb9d6cdb0561d251e2d301c35af6e03 (diff)
Revert "Revert "gpu: nvgpu: gp10b part of new VA allocator""
This reverts commit 30e5947fa1f26ed6bb4f137fd76c8869e91b9829. The original commit was actually fine. Signed-off-by: Alex Waterman <alexw@nvidia.com> Change-Id: I0454415981d29ed0b877f7a21db6f54bc4c30470 Reviewed-on: http://git-master/r/743302 Reviewed-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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
index 3c809eaf..68f4eafa 100644
--- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
@@ -16,6 +16,7 @@
16#include <linux/types.h> 16#include <linux/types.h>
17 17
18#include "gk20a/gk20a.h" 18#include "gk20a/gk20a.h"
19#include "gk20a/gk20a_allocator.h"
19#include "gm20b/ltc_gm20b.h" 20#include "gm20b/ltc_gm20b.h"
20#include "hw_proj_gp10b.h" 21#include "hw_proj_gp10b.h"
21#include "hw_mc_gp10b.h" 22#include "hw_mc_gp10b.h"
@@ -111,9 +112,8 @@ static int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
111 if (err) 112 if (err)
112 return err; 113 return err;
113 114
114 gk20a_allocator_init(&gr->comp_tags, "comptag", 115 __gk20a_allocator_init(&gr->comp_tags, NULL, "comptag",
115 1, /* start */ 116 1, max_comptag_lines - 1, 1, 10, 0);
116 max_comptag_lines - 1); /* length*/
117 117
118 gr->comptags_per_cacheline = comptags_per_cacheline; 118 gr->comptags_per_cacheline = comptags_per_cacheline;
119 gr->slices_per_ltc = slices_per_ltc; 119 gr->slices_per_ltc = slices_per_ltc;