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_page.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_page.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a_allocator_page.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_page.c b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_page.c index 94d30abf..f670fd98 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator_page.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator_page.c | |||
@@ -866,9 +866,9 @@ static int gk20a_page_alloc_init_slabs(struct gk20a_page_allocator *a) | |||
866 | return 0; | 866 | return 0; |
867 | } | 867 | } |
868 | 868 | ||
869 | int gk20a_page_allocator_init(struct gk20a_allocator *__a, | 869 | int gk20a_page_allocator_init(struct gk20a *g, struct gk20a_allocator *__a, |
870 | const char *name, u64 base, u64 length, | 870 | const char *name, u64 base, u64 length, |
871 | u64 blk_size, u64 flags) | 871 | u64 blk_size, u64 flags) |
872 | { | 872 | { |
873 | struct gk20a_page_allocator *a; | 873 | struct gk20a_page_allocator *a; |
874 | char buddy_name[sizeof(__a->name)]; | 874 | char buddy_name[sizeof(__a->name)]; |
@@ -914,12 +914,12 @@ int gk20a_page_allocator_init(struct gk20a_allocator *__a, | |||
914 | 914 | ||
915 | snprintf(buddy_name, sizeof(buddy_name), "%s-src", name); | 915 | snprintf(buddy_name, sizeof(buddy_name), "%s-src", name); |
916 | 916 | ||
917 | err = gk20a_buddy_allocator_init(&a->source_allocator, buddy_name, base, | 917 | err = gk20a_buddy_allocator_init(g, &a->source_allocator, buddy_name, |
918 | length, blk_size, 0); | 918 | base, length, blk_size, 0); |
919 | if (err) | 919 | if (err) |
920 | goto fail; | 920 | goto fail; |
921 | 921 | ||
922 | gk20a_init_alloc_debug(__a); | 922 | gk20a_init_alloc_debug(g, __a); |
923 | palloc_dbg(a, "New allocator: type page\n"); | 923 | palloc_dbg(a, "New allocator: type page\n"); |
924 | palloc_dbg(a, " base 0x%llx\n", a->base); | 924 | palloc_dbg(a, " base 0x%llx\n", a->base); |
925 | palloc_dbg(a, " size 0x%llx\n", a->length); | 925 | palloc_dbg(a, " size 0x%llx\n", a->length); |