summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2018-12-03 14:24:37 -0800
committerEric Anholt <eric@anholt.net>2018-12-07 10:56:36 -0800
commit7b9d2fe4350a9c12f66ad8cc78c1098226f6c3c2 (patch)
tree27c1e9108d97cf99e3d3771566392c7767b96f9d
parent51c1b6f9eb3dbdec91b0e3c89f623e634c996bbb (diff)
downloadlinux-7b9d2fe4350a9c12f66ad8cc78c1098226f6c3c2.tar.bz2
drm/v3d: Stop trying to flush L2C on V3D 3.3+
This cache was replaced with the slice accessing the L2T in the newer generations. Noted by Dave during review. Signed-off-by: Eric Anholt <eric@anholt.net> Link: https://patchwork.freedesktop.org/patch/msgid/20181203222438.25417-5-eric@anholt.net Reviewed-by: Dave Emett <david.emett@broadcom.com>
-rw-r--r--drivers/gpu/drm/v3d/v3d_gem.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
index 2b378de23fbd..06525ea9ec50 100644
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -130,10 +130,15 @@ v3d_flush_l3(struct v3d_dev *v3d)
}
}
-/* Invalidates the (read-only) L2 cache. */
+/* Invalidates the (read-only) L2C cache. This was the L2 cache for
+ * uniforms and instructions on V3D 3.2.
+ */
static void
-v3d_invalidate_l2(struct v3d_dev *v3d, int core)
+v3d_invalidate_l2c(struct v3d_dev *v3d, int core)
{
+ if (v3d->ver > 32)
+ return;
+
V3D_CORE_WRITE(core, V3D_CTL_L2CACTL,
V3D_L2CACTL_L2CCLR |
V3D_L2CACTL_L2CENA);
@@ -168,7 +173,7 @@ v3d_invalidate_caches(struct v3d_dev *v3d)
{
v3d_flush_l3(v3d);
- v3d_invalidate_l2(v3d, 0);
+ v3d_invalidate_l2c(v3d, 0);
v3d_invalidate_slices(v3d, 0);
v3d_flush_l2t(v3d, 0);
}