summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin DuBois <kevindubois@google.com>2023-02-15 21:55:29 +0000
committerTreeHugger Robot <treehugger-gerrit@google.com>2023-02-17 07:22:56 +0000
commit029201e1c88ebdb184efa039f6f2b1b9d8b5cc89 (patch)
tree2a896172ad40c1dc20774be318643b2f1a425f42
parent33e31b35a957610145d9def1cb313baa0045f7ac (diff)
downloadgpu-android-gs-felix-5.10-android13-d3.tar.gz
Revert "mmu: Flush mmu updates regardless of coherency mode"android-13.0.0_r0.93android-gs-felix-5.10-android13-d3
Revert submission 2365722-cherrypick-cherrypick-p22-io-coherency-0zswjzix3t-lh6lkvir9b Reason for revert: b/252072919 Reverted changes: /q/submissionid:2365722-cherrypick-cherrypick-p22-io-coherency-0zswjzix3t-lh6lkvir9b Bug: 252072919 Signed-Off-By: Andrew Chant <achant@google.com> Change-Id: I2a41a20449731c20ec418b42e1e3dd8f41b0a30a
-rw-r--r--mali_kbase/mmu/mali_kbase_mmu.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/mali_kbase/mmu/mali_kbase_mmu.c b/mali_kbase/mmu/mali_kbase_mmu.c
index 5627a09..c98d830 100644
--- a/mali_kbase/mmu/mali_kbase_mmu.c
+++ b/mali_kbase/mmu/mali_kbase_mmu.c
@@ -299,13 +299,12 @@ static void kbase_mmu_sync_pgd_gpu(struct kbase_device *kbdev, struct kbase_cont
static void kbase_mmu_sync_pgd_cpu(struct kbase_device *kbdev, dma_addr_t handle, size_t size)
{
- /* Ensure that the GPU can read the pages from memory.
- *
- * pixel: b/200555454 requires this sync to happen even if the system
- * is coherent.
+ /* In non-coherent system, ensure the GPU can read
+ * the pages from memory
*/
- dma_sync_single_for_device(kbdev->dev, handle, size,
- DMA_TO_DEVICE);
+ if (kbdev->system_coherency == COHERENCY_NONE)
+ dma_sync_single_for_device(kbdev->dev, handle, size,
+ DMA_TO_DEVICE);
}
/**