On Thu, Jul 06, 2023 at 02:10:38PM -0700, Rob Clark wrote: > > From: Rob Clark <robdcl...@chromium.org> > > It is better to explicitly list it. With the move to opaque chip-id's > for future devices, we should avoid trying to infer things like > generation from the numerical value. > > Signed-off-by: Rob Clark <robdcl...@chromium.org> > --- > drivers/gpu/drm/msm/adreno/adreno_device.c | 23 +++++++++++++++------- > drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 + > 2 files changed, 17 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c > b/drivers/gpu/drm/msm/adreno/adreno_device.c > index f469f951a907..3c531da417b9 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > @@ -256,6 +256,7 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_512K, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT, > .init = a6xx_gpu_init, > }, { > .rev = ADRENO_REV(6, 1, 9, ANY_ID), > @@ -266,6 +267,7 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_512K, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT, > .init = a6xx_gpu_init, > .zapfw = "a615_zap.mdt", > .hwcg = a615_hwcg, > @@ -278,6 +280,7 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_1M, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT, > .init = a6xx_gpu_init, > .zapfw = "a630_zap.mdt", > .hwcg = a630_hwcg, > @@ -290,6 +293,7 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_1M, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT, > .init = a6xx_gpu_init, > .zapfw = "a640_zap.mdt", > .hwcg = a640_hwcg, > @@ -302,7 +306,8 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_1M + SZ_128K, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > - .quirks = ADRENO_QUIRK_HAS_HW_APRIV, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | > + ADRENO_QUIRK_HAS_HW_APRIV, > .init = a6xx_gpu_init, > .zapfw = "a650_zap.mdt", > .hwcg = a650_hwcg, > @@ -316,7 +321,8 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_1M + SZ_512K, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > - .quirks = ADRENO_QUIRK_HAS_HW_APRIV, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | > + ADRENO_QUIRK_HAS_HW_APRIV, > .init = a6xx_gpu_init, > .zapfw = "a660_zap.mdt", > .hwcg = a660_hwcg, > @@ -329,7 +335,8 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_512K, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > - .quirks = ADRENO_QUIRK_HAS_HW_APRIV, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | > + ADRENO_QUIRK_HAS_HW_APRIV, > .init = a6xx_gpu_init, > .hwcg = a660_hwcg, > .address_space_size = SZ_16G, > @@ -342,6 +349,7 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_2M, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT, > .init = a6xx_gpu_init, > .zapfw = "a640_zap.mdt", > .hwcg = a640_hwcg, > @@ -353,7 +361,8 @@ static const struct adreno_info gpulist[] = { > }, > .gmem = SZ_4M, > .inactive_period = DRM_MSM_INACTIVE_PERIOD, > - .quirks = ADRENO_QUIRK_HAS_HW_APRIV, > + .quirks = ADRENO_QUIRK_HAS_CACHED_COHERENT | > + ADRENO_QUIRK_HAS_HW_APRIV, > .init = a6xx_gpu_init, > .zapfw = "a690_zap.mdt", > .hwcg = a690_hwcg, > @@ -565,9 +574,9 @@ static int adreno_bind(struct device *dev, struct device > *master, void *data) > if (ret) > return ret; > > - if (config.rev.core >= 6) > - if (!adreno_has_gmu_wrapper(to_adreno_gpu(gpu))) > - priv->has_cached_coherent = true; > + priv->has_cached_coherent = > + !!(info->quirks & ADRENO_QUIRK_HAS_CACHED_COHERENT) && > + !adreno_has_gmu_wrapper(to_adreno_gpu(gpu)); > > return 0; > } > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h > b/drivers/gpu/drm/msm/adreno/adreno_gpu.h > index a7c4a2c536e3..e08d41337169 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h > @@ -33,6 +33,7 @@ enum { > #define ADRENO_QUIRK_FAULT_DETECT_MASK BIT(1) > #define ADRENO_QUIRK_LMLOADKILL_DISABLE BIT(2) > #define ADRENO_QUIRK_HAS_HW_APRIV BIT(3) > +#define ADRENO_QUIRK_HAS_CACHED_COHERENT BIT(4) a shorter ADRENO_IS_IOCOHERENT?
-Akhil > > struct adreno_rev { > uint8_t core; > -- > 2.41.0 >