diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-09-21 17:24:59 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-10-26 14:10:01 -0400 |
commit | 2fa54c94a67e13d84df980d646674dde0ad27168 (patch) | |
tree | 2bf49a012542caa2ad278392b313305f74fe96f6 /drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c | |
parent | 93eea1d72934b28db4707e5aa7ab4dab65d89551 (diff) |
gpu: nvgpu: Remove global debugfs variable
Remove a global debugfs variable and instead save the allocator
debugfs root node in the gk20a struct.
Bug 1799159
Change-Id: If4eed34fa24775e962001e34840b334658f2321c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1225611
(cherry picked from commit 1908fde10bb1fb60ce898ea329f5a441a3e4297a)
Reviewed-on: http://git-master/r/1242390
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c index 32455c98..5b011d8c 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c | |||
@@ -102,6 +102,8 @@ static void gk20a_lockless_alloc_destroy(struct gk20a_allocator *a) | |||
102 | { | 102 | { |
103 | struct gk20a_lockless_allocator *pa = a->priv; | 103 | struct gk20a_lockless_allocator *pa = a->priv; |
104 | 104 | ||
105 | gk20a_fini_alloc_debug(a); | ||
106 | |||
105 | vfree(pa->next); | 107 | vfree(pa->next); |
106 | kfree(pa); | 108 | kfree(pa); |
107 | } | 109 | } |
@@ -137,7 +139,7 @@ static const struct gk20a_allocator_ops pool_ops = { | |||
137 | .print_stats = gk20a_lockless_print_stats, | 139 | .print_stats = gk20a_lockless_print_stats, |
138 | }; | 140 | }; |
139 | 141 | ||
140 | int gk20a_lockless_allocator_init(struct gk20a_allocator *__a, | 142 | int gk20a_lockless_allocator_init(struct gk20a *g, struct gk20a_allocator *__a, |
141 | const char *name, u64 base, u64 length, | 143 | const char *name, u64 base, u64 length, |
142 | u64 blk_size, u64 flags) | 144 | u64 blk_size, u64 flags) |
143 | { | 145 | { |
@@ -189,7 +191,7 @@ int gk20a_lockless_allocator_init(struct gk20a_allocator *__a, | |||
189 | wmb(); | 191 | wmb(); |
190 | a->inited = true; | 192 | a->inited = true; |
191 | 193 | ||
192 | gk20a_init_alloc_debug(__a); | 194 | gk20a_init_alloc_debug(g, __a); |
193 | alloc_dbg(__a, "New allocator: type lockless\n"); | 195 | alloc_dbg(__a, "New allocator: type lockless\n"); |
194 | alloc_dbg(__a, " base 0x%llx\n", a->base); | 196 | alloc_dbg(__a, " base 0x%llx\n", a->base); |
195 | alloc_dbg(__a, " nodes %d\n", a->nr_nodes); | 197 | alloc_dbg(__a, " nodes %d\n", a->nr_nodes); |