delete drm-i915-gt-close-race-between-cacheline_retire-and-free.patch

diff --git a/queue-5.4/drm-i915-gt-close-race-between-cacheline_retire-and-free.patch b/queue-5.4/drm-i915-gt-close-race-between-cacheline_retire-and-free.patch
deleted file mode 100644 (file)
index e562612..0000000
--- a/queue-5.4/drm-i915-gt-close-race-between-cacheline_retire-and-free.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8ea6bb8e4d47e07518e5dba4f5cb77e210f0df82 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 6 Mar 2020 15:46:47 +0000
-Subject: drm/i915/gt: Close race between cacheline_retire and free
-
-From: Chris Wilson <chris@chris-wilson.co.uk>
-
-commit 8ea6bb8e4d47e07518e5dba4f5cb77e210f0df82 upstream.
-
-If the cacheline may still be busy, atomically mark it for future
-release, and only if we can determine that it will never be used again,
-immediately free it.
-
-Closes: https://gitlab.freedesktop.org/drm/intel/issues/1392
-Fixes: ebece7539242 ("drm/i915: Keep timeline HWSP allocated until idle across the system")
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
-Cc: Matthew Auld <matthew.auld@intel.com>
-Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
-Cc: <stable@vger.kernel.org> # v5.2+
-Link: https://patchwork.freedesktop.org/patch/msgid/20200306154647.3528345-1-chris@chris-wilson.co.uk
-(cherry picked from commit 2d4bd971f5baa51418625f379a69f5d58b5a0450)
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/gt/intel_timeline.c |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/i915/gt/intel_timeline.c
-+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
-@@ -197,11 +197,15 @@ static void cacheline_release(struct int
- 
- static void cacheline_free(struct intel_timeline_cacheline *cl)
- {
-+      if (!i915_active_acquire_if_busy(&cl->active)) {
-+              __idle_cacheline_free(cl);
-+              return;
-+      }
-+
-       GEM_BUG_ON(ptr_test_bit(cl->vaddr, CACHELINE_FREE));
-       cl->vaddr = ptr_set_bit(cl->vaddr, CACHELINE_FREE);
- 
--      if (i915_active_is_idle(&cl->active))
--              __idle_cacheline_free(cl);
-+      i915_active_release(&cl->active);
- }
- 
- int intel_timeline_init(struct intel_timeline *timeline,

diff --git a/queue-5.4/series b/queue-5.4/series
index e38678a6a3e1602662d7b9889785a0faf73f1e1e..6cba5ff653339d6ba60a8921a02ed806e90b6545 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -69,7 +69,6 @@ workqueue-don-t-use-wq_select_unbound_cpu-for-bound-works.patch
 drm-amd-display-remove-duplicated-assignment-to-grph_obj_type.patch
 drm-i915-be-more-solid-in-checking-the-alignment.patch
 drm-i915-defer-semaphore-priority-bumping-to-a-workqueue.patch
-drm-i915-gt-close-race-between-cacheline_retire-and-free.patch
 mmc-sdhci-pci-gli-enable-msi-interrupt-for-gl975x.patch
 pinctrl-falcon-fix-syntax-error.patch
 ktest-add-timeout-for-ssh-sync-testing.patch