diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-05-23 19:06:48 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-30 16:24:35 -0400 |
commit | 8d6b5cc349643c5e96384a8dbc27afc705bc5bfc (patch) | |
tree | c3cb1335c0da0aef85c6a54d286b2bc159fd9460 /drivers/gpu/nvgpu/common/mm/vm.c | |
parent | 66a2511a366113fa4d42dc500c9df9b348d9f208 (diff) |
gpu: nvgpu: Move unify_address_spaces to flags
Use the enabled flags API to handle the unify_address_sapce spaces
flag.
JIRA NVGPU-84
JIRA NVGPU-12
JIRA NVGPU-30
Change-Id: Id1b59aed4b349d6067615991597d534936cc5ce9
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1488307
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/vm.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c index bdc8554c..904284ec 100644 --- a/drivers/gpu/nvgpu/common/mm/vm.c +++ b/drivers/gpu/nvgpu/common/mm/vm.c | |||
@@ -22,10 +22,10 @@ | |||
22 | #include <nvgpu/list.h> | 22 | #include <nvgpu/list.h> |
23 | #include <nvgpu/rbtree.h> | 23 | #include <nvgpu/rbtree.h> |
24 | #include <nvgpu/semaphore.h> | 24 | #include <nvgpu/semaphore.h> |
25 | #include <nvgpu/enabled.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
27 | #include "gk20a/mm_gk20a.h" | 28 | #include "gk20a/mm_gk20a.h" |
28 | #include "gk20a/platform_gk20a.h" | ||
29 | 29 | ||
30 | int vm_aspace_id(struct vm_gk20a *vm) | 30 | int vm_aspace_id(struct vm_gk20a *vm) |
31 | { | 31 | { |
@@ -255,7 +255,6 @@ int nvgpu_init_vm(struct mm_gk20a *mm, | |||
255 | u64 user_lp_vma_start, user_lp_vma_limit; | 255 | u64 user_lp_vma_start, user_lp_vma_limit; |
256 | u64 kernel_vma_start, kernel_vma_limit; | 256 | u64 kernel_vma_start, kernel_vma_limit; |
257 | struct gk20a *g = mm->g; | 257 | struct gk20a *g = mm->g; |
258 | struct gk20a_platform *p = gk20a_get_platform(g->dev); | ||
259 | 258 | ||
260 | if (WARN_ON(kernel_reserved + low_hole > aperture_size)) | 259 | if (WARN_ON(kernel_reserved + low_hole > aperture_size)) |
261 | return -ENOMEM; | 260 | return -ENOMEM; |
@@ -275,7 +274,7 @@ int nvgpu_init_vm(struct mm_gk20a *mm, | |||
275 | vm->vma[gmmu_page_size_small] = &vm->user; | 274 | vm->vma[gmmu_page_size_small] = &vm->user; |
276 | vm->vma[gmmu_page_size_big] = &vm->user; | 275 | vm->vma[gmmu_page_size_big] = &vm->user; |
277 | vm->vma[gmmu_page_size_kernel] = &vm->kernel; | 276 | vm->vma[gmmu_page_size_kernel] = &vm->kernel; |
278 | if (!p->unify_address_spaces) | 277 | if (!nvgpu_is_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES)) |
279 | vm->vma[gmmu_page_size_big] = &vm->user_lp; | 278 | vm->vma[gmmu_page_size_big] = &vm->user_lp; |
280 | 279 | ||
281 | vm->va_start = low_hole; | 280 | vm->va_start = low_hole; |
@@ -293,7 +292,7 @@ int nvgpu_init_vm(struct mm_gk20a *mm, | |||
293 | 292 | ||
294 | /* Setup vma limits. */ | 293 | /* Setup vma limits. */ |
295 | if (kernel_reserved + low_hole < aperture_size) { | 294 | if (kernel_reserved + low_hole < aperture_size) { |
296 | if (p->unify_address_spaces) { | 295 | if (nvgpu_is_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES)) { |
297 | user_vma_start = low_hole; | 296 | user_vma_start = low_hole; |
298 | user_vma_limit = vm->va_limit - kernel_reserved; | 297 | user_vma_limit = vm->va_limit - kernel_reserved; |
299 | user_lp_vma_start = user_vma_limit; | 298 | user_lp_vma_start = user_vma_limit; |
@@ -346,7 +345,7 @@ int nvgpu_init_vm(struct mm_gk20a *mm, | |||
346 | * Determine if big pages are possible in this VM. If a split address | 345 | * Determine if big pages are possible in this VM. If a split address |
347 | * space is used then check the user_lp vma instead of the user vma. | 346 | * space is used then check the user_lp vma instead of the user vma. |
348 | */ | 347 | */ |
349 | if (p->unify_address_spaces) | 348 | if (nvgpu_is_enabled(g, NVGPU_MM_UNIFY_ADDRESS_SPACES)) |
350 | vm->big_pages = nvgpu_big_pages_possible(vm, user_vma_start, | 349 | vm->big_pages = nvgpu_big_pages_possible(vm, user_vma_start, |
351 | user_vma_limit - user_vma_start); | 350 | user_vma_limit - user_vma_start); |
352 | else | 351 | else |