diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2016-06-17 08:56:07 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-07-06 06:34:23 -0400 |
commit | b8915ab5aabb02866019221c51d96f304658207f (patch) | |
tree | 16754368daa70c837dea7be8283cf0c5027b23f3 /drivers/gpu/nvgpu/gk20a/semaphore_gk20a.c | |
parent | 67fae6e547ca20c4171e1b3d0ad9d252c2e3c0ee (diff) |
gpu: nvgpu: support in-kernel vidmem mappings
Propagate the buffer aperture flag in gk20a_locked_gmmu_map up so that
buffers represented as a mem_desc and present in vidmem can be mapped to
gpu.
JIRA DNVGPU-18
JIRA DNVGPU-76
Change-Id: I46cf87e27229123016727339b9349d5e2c835b3e
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1169308
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/semaphore_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/semaphore_gk20a.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/semaphore_gk20a.c b/drivers/gpu/nvgpu/gk20a/semaphore_gk20a.c index aa375b24..113c59ef 100644 --- a/drivers/gpu/nvgpu/gk20a/semaphore_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/semaphore_gk20a.c | |||
@@ -187,7 +187,8 @@ int gk20a_semaphore_pool_map(struct gk20a_semaphore_pool *p, | |||
187 | 187 | ||
188 | /* Map into the GPU... Doesn't need to be fixed. */ | 188 | /* Map into the GPU... Doesn't need to be fixed. */ |
189 | p->gpu_va = gk20a_gmmu_map(vm, &p->rw_sg_table, PAGE_SIZE, | 189 | p->gpu_va = gk20a_gmmu_map(vm, &p->rw_sg_table, PAGE_SIZE, |
190 | 0, gk20a_mem_flag_none, false); | 190 | 0, gk20a_mem_flag_none, false, |
191 | APERTURE_SYSMEM); | ||
191 | if (!p->gpu_va) { | 192 | if (!p->gpu_va) { |
192 | err = -ENOMEM; | 193 | err = -ENOMEM; |
193 | goto fail_unmap_sgt; | 194 | goto fail_unmap_sgt; |
@@ -204,7 +205,8 @@ int gk20a_semaphore_pool_map(struct gk20a_semaphore_pool *p, | |||
204 | p->sema_sea->gpu_va, p->sema_sea->map_size, | 205 | p->sema_sea->gpu_va, p->sema_sea->map_size, |
205 | 0, | 206 | 0, |
206 | gk20a_mem_flag_read_only, | 207 | gk20a_mem_flag_read_only, |
207 | false); | 208 | false, |
209 | APERTURE_SYSMEM); | ||
208 | if (!addr) { | 210 | if (!addr) { |
209 | err = -ENOMEM; | 211 | err = -ENOMEM; |
210 | BUG(); | 212 | BUG(); |