From 9e56c92bc9c51ca328e2df4771d255bea009aa9b Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Tue, 23 May 2017 17:45:34 +0300 Subject: [PATCH] video: tegra: host: Support CVNAS This change modifies code to support to determine if an allocation has been done from the CVNAS or DRAM. This information is needed primarily for PVA since it needs to choose the port that is used for DMA accesses. JIRA PVA-457 Change-Id: I99305f8940a2c07eadd65999ee175185b257713c Signed-off-by: Arto Merilainen Reviewed-on: http://git-master/r/1488003 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Shridhar Rasal Reviewed-by: Prashant Gaikwad Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit --- drivers/video/tegra/host/nvdla/nvdla_queue.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/video/tegra/host/nvdla/nvdla_queue.c b/drivers/video/tegra/host/nvdla/nvdla_queue.c index f1680ed2..8d33f11b 100644 --- a/drivers/video/tegra/host/nvdla/nvdla_queue.c +++ b/drivers/video/tegra/host/nvdla/nvdla_queue.c @@ -408,7 +408,7 @@ static int nvdla_map_task_memory(struct nvdla_task *task) err = nvhost_buffer_submit_pin(buffers, &task->memory_dmabuf[jj], - 1, &dma_addr, &dma_size); + 1, &dma_addr, &dma_size, NULL); if (err) { nvdla_dbg_err(pdev, "fail to pin address list"); goto fail_to_pin_mem; @@ -462,7 +462,7 @@ static int nvdla_fill_postactions(struct nvdla_task *task) if (nvhost_buffer_submit_pin(buffers, &task->out_task_status_dmabuf[j], - 1, &dma_addr, &dma_size)) { + 1, &dma_addr, &dma_size, NULL)) { nvdla_dbg_err(pdev, "fail to pin out status"); break; } @@ -538,7 +538,7 @@ static int nvdla_fill_postactions(struct nvdla_task *task) if (nvhost_buffer_submit_pin(buffers, &task->postfences_sem_dmabuf[i], - 1, &dma_addr, &dma_size)) { + 1, &dma_addr, &dma_size, NULL)) { nvdla_dbg_err(pdev, "fail to pin OUT TSSEM"); break; } @@ -568,7 +568,7 @@ static int nvdla_fill_postactions(struct nvdla_task *task) if (nvhost_buffer_submit_pin(buffers, &task->postfences_sem_dmabuf[i], - 1, &dma_addr, &dma_size)) { + 1, &dma_addr, &dma_size, NULL)) { nvdla_dbg_err(pdev, "fail to pin OUT SEM"); break; } @@ -732,7 +732,7 @@ static int nvdla_fill_preactions(struct nvdla_task *task) if (nvhost_buffer_submit_pin(buffers, &task->prefences_sem_dmabuf[i], - 1, &dma_addr, &dma_size)) { + 1, &dma_addr, &dma_size, NULL)) { nvdla_dbg_err(pdev, "fail to pin IN SEM"); break; } @@ -770,7 +770,7 @@ static int nvdla_fill_preactions(struct nvdla_task *task) if (nvhost_buffer_submit_pin(buffers, &task->in_task_status_dmabuf[j], - 1, &dma_addr, &dma_size)) { + 1, &dma_addr, &dma_size, NULL)) { nvdla_dbg_err(pdev, "fail to pin in status"); break; }