nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Fix error paths in init vm

Browse Source 
Error paths called the wrong cleanup sections.

Change-Id: I603af77bf8e3981c029bcf6d582882e51847f137
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/722949
This commit is contained in:
Terje Bergstrom
2015-03-25 12:47:12 -07:00
committed by Dan Willemsen
parent 69ef2e6fa3
commit 87226707cf
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/nvgpu/gk20a/mm_gk20a.c
View File

@@ -2273,10 +2273,8 @@ int gk20a_init_vm(struct mm_gk20a *mm,
vm->pdb.entries = kzalloc(sizeof(struct gk20a_mm_entry) *
(pde_hi + 1), GFP_KERNEL);
if (!vm->pdb.entries) {
err = -ENOMEM;
goto clean_up_pdes;
}
if (!vm->pdb.entries)
return -ENOMEM;
gk20a_dbg_info("init space for %s va_limit=0x%llx num_pdes=%d",
name, vm->va_limit, pde_hi + 1);
@@ -2284,7 +2282,7 @@ int gk20a_init_vm(struct mm_gk20a *mm,
/* allocate the page table directory */
err = gk20a_zalloc_gmmu_page_table(vm, 0, &vm->mmu_levels[0], &vm->pdb);
if (err)
goto clean_up_ptes;
goto clean_up_pdes;
/* First 16GB of the address space goes towards small pages. What ever
* remains is allocated to large pages. */
@@ -2308,7 +2306,7 @@ int gk20a_init_vm(struct mm_gk20a *mm,
low_hole_pages, /*start*/
num_small_pages - low_hole_pages);/* length*/
if (err)
goto clean_up_map_pde;
goto clean_up_ptes;
if (big_pages) {
u32 start = (u32)(small_vma_size >>
@@ -2336,8 +2334,6 @@ int gk20a_init_vm(struct mm_gk20a *mm,
clean_up_small_allocator:
gk20a_allocator_destroy(&vm->vma[gmmu_page_size_small]);
clean_up_map_pde:
unmap_gmmu_pages(&vm->pdb);
clean_up_ptes:
free_gmmu_pages(vm, &vm->pdb);
clean_up_pdes: