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/mm_gk20a.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 079e42ba..9906b77b 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -926,12 +926,12 @@ static int gk20a_init_vidmem(struct mm_gk20a *mm) * initialization requires vidmem but we want to use the CE to zero * out vidmem before allocating it... */ - err = gk20a_page_allocator_init(&g->mm.vidmem.bootstrap_allocator, + err = gk20a_page_allocator_init(g, &g->mm.vidmem.bootstrap_allocator, "vidmem-bootstrap", bootstrap_base, bootstrap_size, SZ_4K, 0); - err = gk20a_page_allocator_init(&g->mm.vidmem.allocator, + err = gk20a_page_allocator_init(g, &g->mm.vidmem.allocator, "vidmem", base, size - base, default_page_size, @@ -4336,7 +4336,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-fixed", name); - err = __gk20a_buddy_allocator_init(&vm->fixed, + err = __gk20a_buddy_allocator_init(g, &vm->fixed, vm, alloc_name, small_vma_start, g->separate_fixed_allocs, @@ -4354,6 +4354,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-%dKB", name, vm->gmmu_page_sizes[gmmu_page_size_small] >> 10); err = __gk20a_buddy_allocator_init( + g, &vm->vma[gmmu_page_size_small], vm, alloc_name, small_vma_start, @@ -4369,6 +4370,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-%dKB", name, vm->gmmu_page_sizes[gmmu_page_size_big] >> 10); err = __gk20a_buddy_allocator_init( + g, &vm->vma[gmmu_page_size_big], vm, alloc_name, large_vma_start, @@ -4385,7 +4387,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, /* * kernel reserved VMA is at the end of the aperture */ - err = __gk20a_buddy_allocator_init(&vm->vma[gmmu_page_size_kernel], + err = __gk20a_buddy_allocator_init(g, &vm->vma[gmmu_page_size_kernel], vm, alloc_name, kernel_vma_start, kernel_vma_limit - kernel_vma_start, -- cgit v1.2.2