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_buddy.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_allocator_buddy.c') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_buddy.c b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_buddy.c index a8a031be..3715e9f8 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_buddy.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_buddy.c @@ -1218,7 +1218,7 @@ static const struct gk20a_allocator_ops buddy_ops = { * will try and pick a reasonable max order. * @flags: Extra flags necessary. See GPU_BALLOC_*. */ -int __gk20a_buddy_allocator_init(struct gk20a_allocator *__a, +int __gk20a_buddy_allocator_init(struct gk20a *g, struct gk20a_allocator *__a, struct vm_gk20a *vm, const char *name, u64 base, u64 size, u64 blk_size, u64 max_order, u64 flags) @@ -1303,7 +1303,7 @@ int __gk20a_buddy_allocator_init(struct gk20a_allocator *__a, wmb(); a->initialized = 1; - gk20a_init_alloc_debug(__a); + gk20a_init_alloc_debug(g, __a); alloc_dbg(__a, "New allocator: type buddy\n"); alloc_dbg(__a, " base 0x%llx\n", a->base); alloc_dbg(__a, " size 0x%llx\n", a->length); @@ -1318,9 +1318,10 @@ fail: return err; } -int gk20a_buddy_allocator_init(struct gk20a_allocator *a, const char *name, - u64 base, u64 size, u64 blk_size, u64 flags) +int gk20a_buddy_allocator_init(struct gk20a *g, struct gk20a_allocator *a, + const char *name, u64 base, u64 size, + u64 blk_size, u64 flags) { - return __gk20a_buddy_allocator_init(a, NULL, name, + return __gk20a_buddy_allocator_init(g, a, NULL, name, base, size, blk_size, 0, 0); } -- cgit v1.2.2