diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/nvgpu_mem.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c index 58488067..34fd6626 100644 --- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <nvgpu/page_allocator.h> | 19 | #include <nvgpu/page_allocator.h> |
20 | #include <nvgpu/log.h> | 20 | #include <nvgpu/log.h> |
21 | #include <nvgpu/bug.h> | 21 | #include <nvgpu/bug.h> |
22 | #include <nvgpu/enabled.h> | ||
22 | 23 | ||
23 | #include <nvgpu/linux/dma.h> | 24 | #include <nvgpu/linux/dma.h> |
24 | 25 | ||
@@ -30,8 +31,9 @@ u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture, | |||
30 | { | 31 | { |
31 | switch (aperture) { | 32 | switch (aperture) { |
32 | case APERTURE_SYSMEM: | 33 | case APERTURE_SYSMEM: |
33 | /* sysmem for dgpus; some igpus consider system memory vidmem */ | 34 | /* some igpus consider system memory vidmem */ |
34 | return g->mm.vidmem_is_vidmem ? sysmem_mask : vidmem_mask; | 35 | return nvgpu_is_enabled(g, NVGPU_MM_HONORS_APERTURE) |
36 | ? sysmem_mask : vidmem_mask; | ||
35 | case APERTURE_VIDMEM: | 37 | case APERTURE_VIDMEM: |
36 | /* for dgpus only */ | 38 | /* for dgpus only */ |
37 | return vidmem_mask; | 39 | return vidmem_mask; |