2019-09-19 14:43:19 +00:00
|
|
|
From abee30ca29ec11b62842934de04b5a0033bff21b Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Date: Mon, 3 Dec 2018 14:24:37 -0800
|
2019-12-23 12:42:55 +00:00
|
|
|
Subject: [PATCH] drm/v3d: Stop trying to flush L2C on V3D 3.3+
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
(cherry picked from commit 7b9d2fe4350a9c12f66ad8cc78c1098226f6c3c2)
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/v3d/v3d_gem.c | 11 ++++++++---
|
|
|
|
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- 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 *v3
|
|
|
|
|
{
|
|
|
|
|
v3d_flush_l3(v3d);
|
|
|
|
|
|
|
|
|
|
- v3d_invalidate_l2(v3d, 0);
|
|
|
|
|
+ v3d_invalidate_l2c(v3d, 0);
|
|
|
|
|
v3d_invalidate_slices(v3d, 0);
|
|
|
|
|
v3d_flush_l2t(v3d, 0);
|
|
|
|
|
}
|
