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/gm20b | |
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/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index eb9ae08c..c503bc48 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -412,7 +412,8 @@ int prepare_ucode_blob(struct gk20a *g) | |||
412 | sg_dma_address(sgt->sgl) = 0; | 412 | sg_dma_address(sgt->sgl) = 0; |
413 | 413 | ||
414 | g->pmu.wpr_buf.gpu_va = gk20a_gmmu_map(vm, &sgt, wprsize, | 414 | g->pmu.wpr_buf.gpu_va = gk20a_gmmu_map(vm, &sgt, wprsize, |
415 | 0, gk20a_mem_flag_none, false); | 415 | 0, gk20a_mem_flag_none, false, |
416 | APERTURE_SYSMEM); | ||
416 | gm20b_dbg_pmu("wpr mapped gpu va :%llx\n", g->pmu.wpr_buf.gpu_va); | 417 | gm20b_dbg_pmu("wpr mapped gpu va :%llx\n", g->pmu.wpr_buf.gpu_va); |
417 | 418 | ||
418 | /* Discover all managed falcons*/ | 419 | /* Discover all managed falcons*/ |
@@ -1412,7 +1413,8 @@ int pmu_exec_gen_bl(struct gk20a *g, void *desc, u8 b_wait_for_halt) | |||
1412 | acr->hsbl_ucode.gpu_va = gk20a_gmmu_map(vm, &acr->hsbl_ucode.sgt, | 1413 | acr->hsbl_ucode.gpu_va = gk20a_gmmu_map(vm, &acr->hsbl_ucode.sgt, |
1413 | bl_sz, | 1414 | bl_sz, |
1414 | 0, /* flags */ | 1415 | 0, /* flags */ |
1415 | gk20a_mem_flag_read_only, false); | 1416 | gk20a_mem_flag_read_only, false, |
1417 | acr->hsbl_ucode.aperture); | ||
1416 | if (!acr->hsbl_ucode.gpu_va) { | 1418 | if (!acr->hsbl_ucode.gpu_va) { |
1417 | gk20a_err(d, "failed to map pmu ucode memory!!"); | 1419 | gk20a_err(d, "failed to map pmu ucode memory!!"); |
1418 | goto err_free_ucode; | 1420 | goto err_free_ucode; |