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.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_allocator.h') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h index dc065ffa..b12926b3 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h @@ -26,6 +26,7 @@ struct gk20a_allocator; struct gk20a_alloc_carveout; struct vm_gk20a; +struct gk20a; /* * Operations for an allocator to implement. @@ -173,25 +174,25 @@ static inline void alloc_unlock(struct gk20a_allocator *a) /* * Buddy allocator specific initializers. */ -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); -int gk20a_buddy_allocator_init(struct gk20a_allocator *allocator, +int gk20a_buddy_allocator_init(struct gk20a *g, struct gk20a_allocator *a, const char *name, u64 base, u64 size, u64 blk_size, u64 flags); /* * Bitmap initializers. */ -int gk20a_bitmap_allocator_init(struct gk20a_allocator *__a, +int gk20a_bitmap_allocator_init(struct gk20a *g, struct gk20a_allocator *a, const char *name, u64 base, u64 length, u64 blk_size, u64 flags); /* * Page allocator initializers. */ -int gk20a_page_allocator_init(struct gk20a_allocator *__a, +int gk20a_page_allocator_init(struct gk20a *g, struct gk20a_allocator *a, const char *name, u64 base, u64 length, u64 blk_size, u64 flags); @@ -200,7 +201,7 @@ int gk20a_page_allocator_init(struct gk20a_allocator *__a, * Note: This allocator can only allocate fixed-size structures of a * pre-defined size. */ -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 struct_size, u64 flags); @@ -234,8 +235,9 @@ void gk20a_alloc_print_stats(struct gk20a_allocator *a, /* * Common functionality for the internals of the allocators. */ -void gk20a_init_alloc_debug(struct gk20a_allocator *a); +void gk20a_init_alloc_debug(struct gk20a *g, struct gk20a_allocator *a); void gk20a_fini_alloc_debug(struct gk20a_allocator *a); + int __gk20a_alloc_common_init(struct gk20a_allocator *a, const char *name, void *priv, bool dbg, const struct gk20a_allocator_ops *ops); -- cgit v1.2.2