From: Lucas Stach <l.stach@pengutronix.de>
Date: Wed, 17 Aug 2016 14:19:53 +0000 (+0200)
Subject: drm/etnaviv: only check if the cmdbuf is inside the linear window on MMUv1
X-Git-Tag: v4.9-rc1~41^2~15^2~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=acfee0ec03712a8ff37daae13e2c4b3f3f45336c;p=karo-tx-linux.git

drm/etnaviv: only check if the cmdbuf is inside the linear window on MMUv1

There is no linear window on MMUv2 and the FE can access the full 4GB
address space either directly (as long as the MMU isn't configured) or
through the MMU, once it is up.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 5dab777e57d0..deb1d0c192dc 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -678,7 +678,9 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
 		dev_err(gpu->dev, "could not create command buffer\n");
 		goto destroy_iommu;
 	}
-	if (gpu->buffer->paddr - gpu->memory_base > 0x80000000) {
+
+	if (gpu->mmu->version == ETNAVIV_IOMMU_V1 &&
+	    gpu->buffer->paddr - gpu->memory_base > 0x80000000) {
 		ret = -EINVAL;
 		dev_err(gpu->dev,
 			"command buffer outside valid memory window\n");