diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 10 |
1 files changed, 6 insertions, 4 deletions
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) | |||
926 | * initialization requires vidmem but we want to use the CE to zero | 926 | * initialization requires vidmem but we want to use the CE to zero |
927 | * out vidmem before allocating it... | 927 | * out vidmem before allocating it... |
928 | */ | 928 | */ |
929 | err = gk20a_page_allocator_init(&g->mm.vidmem.bootstrap_allocator, | 929 | err = gk20a_page_allocator_init(g, &g->mm.vidmem.bootstrap_allocator, |
930 | "vidmem-bootstrap", | 930 | "vidmem-bootstrap", |
931 | bootstrap_base, bootstrap_size, | 931 | bootstrap_base, bootstrap_size, |
932 | SZ_4K, 0); | 932 | SZ_4K, 0); |
933 | 933 | ||
934 | err = gk20a_page_allocator_init(&g->mm.vidmem.allocator, | 934 | err = gk20a_page_allocator_init(g, &g->mm.vidmem.allocator, |
935 | "vidmem", | 935 | "vidmem", |
936 | base, size - base, | 936 | base, size - base, |
937 | default_page_size, | 937 | default_page_size, |
@@ -4336,7 +4336,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, | |||
4336 | snprintf(alloc_name, sizeof(alloc_name), | 4336 | snprintf(alloc_name, sizeof(alloc_name), |
4337 | "gk20a_%s-fixed", name); | 4337 | "gk20a_%s-fixed", name); |
4338 | 4338 | ||
4339 | err = __gk20a_buddy_allocator_init(&vm->fixed, | 4339 | err = __gk20a_buddy_allocator_init(g, &vm->fixed, |
4340 | vm, alloc_name, | 4340 | vm, alloc_name, |
4341 | small_vma_start, | 4341 | small_vma_start, |
4342 | g->separate_fixed_allocs, | 4342 | g->separate_fixed_allocs, |
@@ -4354,6 +4354,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, | |||
4354 | snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-%dKB", name, | 4354 | snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-%dKB", name, |
4355 | vm->gmmu_page_sizes[gmmu_page_size_small] >> 10); | 4355 | vm->gmmu_page_sizes[gmmu_page_size_small] >> 10); |
4356 | err = __gk20a_buddy_allocator_init( | 4356 | err = __gk20a_buddy_allocator_init( |
4357 | g, | ||
4357 | &vm->vma[gmmu_page_size_small], | 4358 | &vm->vma[gmmu_page_size_small], |
4358 | vm, alloc_name, | 4359 | vm, alloc_name, |
4359 | small_vma_start, | 4360 | small_vma_start, |
@@ -4369,6 +4370,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, | |||
4369 | snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-%dKB", | 4370 | snprintf(alloc_name, sizeof(alloc_name), "gk20a_%s-%dKB", |
4370 | name, vm->gmmu_page_sizes[gmmu_page_size_big] >> 10); | 4371 | name, vm->gmmu_page_sizes[gmmu_page_size_big] >> 10); |
4371 | err = __gk20a_buddy_allocator_init( | 4372 | err = __gk20a_buddy_allocator_init( |
4373 | g, | ||
4372 | &vm->vma[gmmu_page_size_big], | 4374 | &vm->vma[gmmu_page_size_big], |
4373 | vm, alloc_name, | 4375 | vm, alloc_name, |
4374 | large_vma_start, | 4376 | large_vma_start, |
@@ -4385,7 +4387,7 @@ int gk20a_init_vm(struct mm_gk20a *mm, | |||
4385 | /* | 4387 | /* |
4386 | * kernel reserved VMA is at the end of the aperture | 4388 | * kernel reserved VMA is at the end of the aperture |
4387 | */ | 4389 | */ |
4388 | err = __gk20a_buddy_allocator_init(&vm->vma[gmmu_page_size_kernel], | 4390 | err = __gk20a_buddy_allocator_init(g, &vm->vma[gmmu_page_size_kernel], |
4389 | vm, alloc_name, | 4391 | vm, alloc_name, |
4390 | kernel_vma_start, | 4392 | kernel_vma_start, |
4391 | kernel_vma_limit - kernel_vma_start, | 4393 | kernel_vma_limit - kernel_vma_start, |