diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2015-06-02 06:43:01 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:52:06 -0500 |
commit | 021748b782b054ed11d02341ee373f60b1ae0cb3 (patch) | |
tree | 87bc67bdeda08acc3f7a46d2c662e73a5948538a /drivers/gpu/nvgpu/gp10b/mm_gp10b.h | |
parent | 65ef5bc238a782e76c5d104ef90562b1fe6dd038 (diff) |
gpu: nvgpu: fix allocator_init() calls
Change for new VA space allocator is being reverted with
http://git-master/r/#/c/749291/ but only for Kernel3.18
In Kernel3.10, we support the new VA allocator
Since we support both the kernel versions as of now,
use a KERNEL_VERSION based mechanism to select
appropriate call
Define new macro NVGPU_USE_NEW_ALLOCATOR for Kernel3.10
where we want to use new allocator
Bug 200106514
Change-Id: I9af26d555278c40e03fe82b0912961a862c8bf55
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/751353
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/mm_gp10b.h')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h index 034944e0..f34200a0 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h | |||
@@ -14,8 +14,16 @@ | |||
14 | #ifndef MM_GP10B_H | 14 | #ifndef MM_GP10B_H |
15 | #define MM_GP10B_H | 15 | #define MM_GP10B_H |
16 | 16 | ||
17 | #include <linux/version.h> | ||
18 | |||
17 | #define NVGPU_MM_GET_IO_COHERENCE_BIT 35 | 19 | #define NVGPU_MM_GET_IO_COHERENCE_BIT 35 |
18 | 20 | ||
21 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) | ||
22 | #define NVGPU_USE_NEW_ALLOCATOR 1 | ||
23 | #else | ||
24 | #define NVGPU_USE_NEW_ALLOCATOR 0 | ||
25 | #endif | ||
26 | |||
19 | struct gpu_ops; | 27 | struct gpu_ops; |
20 | 28 | ||
21 | void gp10b_init_mm(struct gpu_ops *gops); | 29 | void gp10b_init_mm(struct gpu_ops *gops); |