summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2022-03-23 17:08:24 +0100
committerLucas Stach <l.stach@pengutronix.de>2022-04-06 10:01:43 +0200
commit9247fcca3982a29b04b002f0d30def9ff50740d5 (patch)
tree78ee0c919d7212d3122abcad444a8cb811620ab7
parent11ad6a1f181f28dccbe47a7fb41f56557573941a (diff)
downloadlinux-9247fcca3982a29b04b002f0d30def9ff50740d5.tar.gz
linux-9247fcca3982a29b04b002f0d30def9ff50740d5.tar.xz
drm/etnaviv: move flush_seq increment into etnaviv_iommu_map/unmap
The flush sequence is a marker that the page tables have been changed and any affected TLBs need to be flushed. Move the flush_seq increment a little further down the call stack to place it next to the actual page table manipulation. Not functional change. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Tested-by: Guido Günther <agx@sigxcpu.org> Acked-by: Guido Günther <agx@sigxcpu.org>
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_mmu.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
index 3957b9a752f5..d41295208102 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
@@ -92,6 +92,8 @@ static int etnaviv_iommu_map(struct etnaviv_iommu_context *context, u32 iova,
da += bytes;
}
+ context->flush_seq++;
+
return 0;
fail:
@@ -117,6 +119,8 @@ static void etnaviv_iommu_unmap(struct etnaviv_iommu_context *context, u32 iova,
da += bytes;
}
+
+ context->flush_seq++;
}
static void etnaviv_iommu_remove_mapping(struct etnaviv_iommu_context *context,
@@ -274,7 +278,6 @@ int etnaviv_iommu_map_gem(struct etnaviv_iommu_context *context,
mapping->context = etnaviv_iommu_context_get(context);
list_add_tail(&mapping->mmu_node, &context->mappings);
- context->flush_seq++;
unlock:
mutex_unlock(&context->lock);
@@ -299,7 +302,6 @@ void etnaviv_iommu_unmap_gem(struct etnaviv_iommu_context *context,
etnaviv_iommu_remove_mapping(context, mapping);
list_del(&mapping->mmu_node);
- context->flush_seq++;
mutex_unlock(&context->lock);
etnaviv_iommu_context_put(context);
}