From 2fa54c94a67e13d84df980d646674dde0ad27168 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 21 Sep 2016 14:24:59 -0700 Subject: 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 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 --- drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_allocator_lockless.c') 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) { struct gk20a_lockless_allocator *pa = a->priv; + gk20a_fini_alloc_debug(a); + vfree(pa->next); kfree(pa); } @@ -137,7 +139,7 @@ static const struct gk20a_allocator_ops pool_ops = { .print_stats = gk20a_lockless_print_stats, }; -int gk20a_lockless_allocator_init(struct gk20a_allocator *__a, +int gk20a_lockless_allocator_init(struct gk20a *g, struct gk20a_allocator *__a, const char *name, u64 base, u64 length, u64 blk_size, u64 flags) { @@ -189,7 +191,7 @@ int gk20a_lockless_allocator_init(struct gk20a_allocator *__a, wmb(); a->inited = true; - gk20a_init_alloc_debug(__a); + gk20a_init_alloc_debug(g, __a); alloc_dbg(__a, "New allocator: type lockless\n"); alloc_dbg(__a, " base 0x%llx\n", a->base); alloc_dbg(__a, " nodes %d\n", a->nr_nodes); -- cgit v1.2.2