From 50ae563cd85b6e2dcdfdd0726e79ce3c5b0ce5a3 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Mon, 30 Mar 2020 12:24:00 -0600 Subject: [PATCH] msm: kgsl: Set the I/O coherent feature earlier Some of the KGSL core code needs to make a decision about I/O coherency so set the MMU property earlier to prevent an unneeded warning. Change-Id: Ic0dedbadf9e4665b3e20460cb6f2ca81d74847e0 Signed-off-by: Jordan Crouse --- drivers/gpu/msm/adreno.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c index f3d6b6ccdb9b..d1fb8d4772de 100644 --- a/drivers/gpu/msm/adreno.c +++ b/drivers/gpu/msm/adreno.c @@ -1418,6 +1418,9 @@ static int adreno_bind(struct device *dev) if (adreno_is_a6xx(adreno_dev)) kgsl_mmu_set_feature(device, KGSL_MMU_SMMU_APERTURE); + if (ADRENO_FEATURE(adreno_dev, ADRENO_IOCOHERENT)) + kgsl_mmu_set_feature(device, KGSL_MMU_IO_COHERENT); + device->pwrctrl.bus_width = adreno_dev->gpucore->bus_width; device->mmu.secured = (IS_ENABLED(CONFIG_QCOM_SECURE_BUFFER) && @@ -1449,9 +1452,6 @@ static int adreno_bind(struct device *dev) adreno_isense_probe(device); - if (ADRENO_FEATURE(adreno_dev, ADRENO_IOCOHERENT)) - kgsl_mmu_set_feature(device, KGSL_MMU_IO_COHERENT); - /* Allocate the memstore for storing timestamps and other useful info */ if (ADRENO_FEATURE(adreno_dev, ADRENO_APRIV))