drm/etnaviv: don't disable TS on MMUv2 core when moving the linear window

On MMUv2 cores the linear window is only relevant when starting the FE,
before the MMU has been activated. Once the MMU is active, all accesses
are translated with no way to bypass the MMU via the linear window. Thus
TS ignoring the linear window offset is not an issue on cores with MMUv2
present and there is no need to disable TS when we need to move the
linear window.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Tested-by: Joao Paulo Goncalves <joao.goncalves@toradex.com>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index d84d73c197fc31e6462c3c34d7c02e0df37c5071..7502c55199b8abdda2f2a38f3f0ec2e181ef4d41 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -863,12 +863,15 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
         *
         * On MC1.0 cores the linear window offset is ignored by the TS engine,
         * leading to inconsistent memory views. Avoid using the offset on those
-        * cores if possible, otherwise disable the TS feature.
+        * cores if possible, otherwise disable the TS feature. MMUv2 doesn't
+        * expose this issue, as all TS accesses are MMU translated, so the
+        * linear window offset won't be used.
         */
        cmdbuf_paddr = ALIGN_DOWN(etnaviv_cmdbuf_get_pa(&gpu->buffer), SZ_128M);
 
        if (!(gpu->identity.features & chipFeatures_PIPE_3D) ||
-           (gpu->identity.minor_features0 & chipMinorFeatures0_MC20)) {
+           (gpu->identity.minor_features0 & chipMinorFeatures0_MC20) ||
+           (gpu->identity.minor_features1 & chipMinorFeatures1_MMU_VERSION)) {
                if (cmdbuf_paddr >= SZ_2G)
                        priv->mmu_global->memory_base = SZ_2G;
                else