summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
diff options
context:
space:
mode:
authorLucas Stach2016-08-17 14:57:51 +0200
committerLucas Stach2016-09-15 15:29:37 +0200
commite07c0db5e84a5f1a16af8567d5fdde2ca6d2c80e (patch)
tree781ad8eeff8ea21269672fdc6ab958f49afcb21e /drivers/gpu/drm/etnaviv/etnaviv_gpu.c
parentdrm/etnaviv: remove unused iommu_v2 header (diff)
downloadkernel-qcow2-linux-e07c0db5e84a5f1a16af8567d5fdde2ca6d2c80e.tar.gz
kernel-qcow2-linux-e07c0db5e84a5f1a16af8567d5fdde2ca6d2c80e.tar.xz
kernel-qcow2-linux-e07c0db5e84a5f1a16af8567d5fdde2ca6d2c80e.zip
drm/etnaviv: move gpu_va() to etnaviv mmu
The GPU virtual address for the command buffers differs depending on the IOMMU version. Move the calculation of the iova into etnaviv mmu, to enable proper dispatch. Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gpu.c')
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_gpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 9ecb23b1089b..6309d27045a6 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -574,7 +574,7 @@ static void etnaviv_gpu_hw_init(struct etnaviv_gpu *gpu)
gpu_write(gpu, VIVS_HI_INTR_ENBL, ~0U);
gpu_write(gpu, VIVS_FE_COMMAND_ADDRESS,
- gpu->buffer->paddr - gpu->memory_base);
+ etnaviv_iommu_get_cmdbuf_va(gpu, gpu->buffer));
gpu_write(gpu, VIVS_FE_COMMAND_CONTROL,
VIVS_FE_COMMAND_CONTROL_ENABLE |
VIVS_FE_COMMAND_CONTROL_PREFETCH(prefetch));