From: Lucas Stach Date: Wed, 17 Aug 2016 14:15:25 +0000 (+0200) Subject: drm/etnaviv: only try to use the linear window on MMUv1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1486b1cb80cb8676d573a27ced5423658fdd32de;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/etnaviv: only try to use the linear window on MMUv1 As the comment above the code states, the linear window is only available on MMUv1. Don't try to use it on MMUv2. Signed-off-by: Lucas Stach --- diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c index 29a723fabc17..e2013b5b3f6a 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c @@ -115,7 +115,8 @@ int etnaviv_iommu_map_gem(struct etnaviv_iommu *mmu, mutex_lock(&mmu->lock); /* v1 MMU can optimize single entry (contiguous) scatterlists */ - if (sgt->nents == 1 && !(etnaviv_obj->flags & ETNA_BO_FORCE_MMU)) { + if (mmu->version == ETNAVIV_IOMMU_V1 && + sgt->nents == 1 && !(etnaviv_obj->flags & ETNA_BO_FORCE_MMU)) { u32 iova; iova = sg_dma_address(sgt->sgl) - memory_base;