diff options
author | Sami Kiminki <skiminki@nvidia.com> | 2017-11-02 06:34:57 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-08 12:09:08 -0500 |
commit | c22a5af9137394524f76e1f54b4e48fe92714fec (patch) | |
tree | 9a8074d57e5e3b67b86cc80c8b3638dbecbce061 /drivers/gpu/nvgpu/vgpu | |
parent | 02d281d0776e2b8305b18823343a2ee972b72657 (diff) |
gpu: nvgpu: Remove support for legacy mapping
Make NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL mandatory for all map
IOCTLs. We'll clean up the legacy kernel code in subsequent patches.
Remove support for NVGPU_AS_IOCTL_MAP_BUFFER. It has been superseded
by NVGPU_AS_IOCTL_MAP_BUFFER_EX.
Remove legacy definitions to nvgpu_map_buffer_args and the related
flags, and update the in-kernel map calls accordingly by switching to
the newer definitions.
Bug 1902982
Change-Id: Ie9a7f02b8d5d0ec7c3722c4481afab6d39b4fbd0
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1560932
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/mm_vgpu.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c index f063961f..e4437ed2 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c | |||
@@ -169,8 +169,7 @@ u64 vgpu_gp10b_locked_gmmu_map(struct vm_gk20a *vm, | |||
169 | p->pgsz_idx = pgsz_idx; | 169 | p->pgsz_idx = pgsz_idx; |
170 | p->iova = 0; | 170 | p->iova = 0; |
171 | p->kind = kind_v; | 171 | p->kind = kind_v; |
172 | p->cacheable = | 172 | p->cacheable = (flags & NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE) ? 1 : 0; |
173 | (flags & NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE) ? 1 : 0; | ||
174 | p->prot = prot; | 173 | p->prot = prot; |
175 | p->ctag_offset = ctag_offset; | 174 | p->ctag_offset = ctag_offset; |
176 | p->clear_ctags = clear_ctags; | 175 | p->clear_ctags = clear_ctags; |
diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c index c4256afb..498a1528 100644 --- a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c | |||
@@ -153,8 +153,7 @@ u64 vgpu_locked_gmmu_map(struct vm_gk20a *vm, | |||
153 | p->pgsz_idx = pgsz_idx; | 153 | p->pgsz_idx = pgsz_idx; |
154 | p->iova = mapping ? 1 : 0; | 154 | p->iova = mapping ? 1 : 0; |
155 | p->kind = kind_v; | 155 | p->kind = kind_v; |
156 | p->cacheable = | 156 | p->cacheable = (flags & NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE) ? 1 : 0; |
157 | (flags & NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE) ? 1 : 0; | ||
158 | p->prot = prot; | 157 | p->prot = prot; |
159 | p->ctag_offset = ctag_offset; | 158 | p->ctag_offset = ctag_offset; |
160 | p->clear_ctags = clear_ctags; | 159 | p->clear_ctags = clear_ctags; |