gpu: nvgpu: Use actual carveouts for WPR region

Use a carveout for the WPR region in the VIDMEM.

Jira DNVGPU-84

Change-Id: I191ecc3bb317ae3af6b56f5970194e646c513964
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1208527
(cherry picked from commit 7edf74d7468dcff1f01cbd901d83aa0e32602f0e)
Reviewed-on: http://git-master/r/1223455
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Alex Waterman
2016-08-16 17:36:17 -07:00
committed by mobile promotions
parent aa14efa2b4
commit f361f89b12

View File

@@ -895,6 +895,10 @@ static int gk20a_init_vidmem(struct mm_gk20a *mm)
u64 default_page_size = SZ_64K;
int err;
static struct gk20a_alloc_carveout wpr_co =
GK20A_CARVEOUT("wpr-region",
NVGPU_VIDMEM_BOOTSTRAP_ALLOCATOR_BASE, SZ_16M);
if (!size)
return 0;
@@ -921,8 +925,7 @@ static int gk20a_init_vidmem(struct mm_gk20a *mm)
}
/* Reserve bootstrap region in vidmem allocator */
gk20a_alloc_fixed(&g->mm.vidmem.allocator,
bootstrap_base, bootstrap_size);
gk20a_alloc_reserve_carveout(&g->mm.vidmem.allocator, &wpr_co);
mm->vidmem.base = base;
mm->vidmem.size = size - base;