brcm2708: update to latest patches from RPi foundation
[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.19 / 950-0494-drm-v3d-Drop-unused-v3d_flush_caches.patch
diff --git a/target/linux/brcm2708/patches-4.19/950-0494-drm-v3d-Drop-unused-v3d_flush_caches.patch b/target/linux/brcm2708/patches-4.19/950-0494-drm-v3d-Drop-unused-v3d_flush_caches.patch
new file mode 100644 (file)
index 0000000..aba98eb
--- /dev/null
@@ -0,0 +1,64 @@
+From 065c8947cb7c40bfb3e76dcbb9d901b5e8fe0ea4 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Mon, 3 Dec 2018 14:24:34 -0800
+Subject: [PATCH] drm/v3d: Drop unused v3d_flush_caches().
+
+Now that I've specified how the end-of-pipeline flushing should work,
+we're never going to use this function.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+Reviewed-by: Dave Emett <david.emett@broadcom.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20181203222438.25417-2-eric@anholt.net
+(cherry picked from commit 2aa34fd5c7754824cf5488b61ac644f30d3c5c85)
+---
+ drivers/gpu/drm/v3d/v3d_drv.h |  1 -
+ drivers/gpu/drm/v3d/v3d_gem.c | 21 ---------------------
+ 2 files changed, 22 deletions(-)
+
+--- a/drivers/gpu/drm/v3d/v3d_drv.h
++++ b/drivers/gpu/drm/v3d/v3d_drv.h
+@@ -308,7 +308,6 @@ void v3d_exec_put(struct v3d_exec_info *
+ void v3d_tfu_job_put(struct v3d_tfu_job *exec);
+ void v3d_reset(struct v3d_dev *v3d);
+ void v3d_invalidate_caches(struct v3d_dev *v3d);
+-void v3d_flush_caches(struct v3d_dev *v3d);
+ /* v3d_irq.c */
+ int v3d_irq_init(struct v3d_dev *v3d);
+--- a/drivers/gpu/drm/v3d/v3d_gem.c
++++ b/drivers/gpu/drm/v3d/v3d_gem.c
+@@ -175,20 +175,6 @@ v3d_invalidate_slices(struct v3d_dev *v3
+                      V3D_SET_FIELD(0xf, V3D_SLCACTL_ICC));
+ }
+-/* Invalidates texture L2 cachelines */
+-static void
+-v3d_invalidate_l2t(struct v3d_dev *v3d, int core)
+-{
+-      V3D_CORE_WRITE(core,
+-                     V3D_CTL_L2TCACTL,
+-                     V3D_L2TCACTL_L2TFLS |
+-                     V3D_SET_FIELD(V3D_L2TCACTL_FLM_CLEAR, V3D_L2TCACTL_FLM));
+-      if (wait_for(!(V3D_CORE_READ(core, V3D_CTL_L2TCACTL) &
+-                     V3D_L2TCACTL_L2TFLS), 100)) {
+-              DRM_ERROR("Timeout waiting for L2T invalidate\n");
+-      }
+-}
+-
+ void
+ v3d_invalidate_caches(struct v3d_dev *v3d)
+ {
+@@ -199,13 +185,6 @@ v3d_invalidate_caches(struct v3d_dev *v3
+       v3d_flush_l2t(v3d, 0);
+ }
+-void
+-v3d_flush_caches(struct v3d_dev *v3d)
+-{
+-      v3d_invalidate_l1td(v3d, 0);
+-      v3d_invalidate_l2t(v3d, 0);
+-}
+-
+ static void
+ v3d_attach_object_fences(struct v3d_bo **bos, int bo_count,
+                        struct dma_fence *fence)