drop queue-6.0/drm-i915-reset-handle-reset-timeouts-under-unrelated.patch

not needed.

diff --git a/queue-6.0/drm-i915-reset-handle-reset-timeouts-under-unrelated.patch b/queue-6.0/drm-i915-reset-handle-reset-timeouts-under-unrelated.patch
deleted file mode 100644 (file)
index f57af76..0000000
--- a/queue-6.0/drm-i915-reset-handle-reset-timeouts-under-unrelated.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 299c5a8bbfa2562ba358249b922baa2bcb0e96f4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 29 Jun 2022 21:39:59 -0700
-Subject: drm/i915/reset: Handle reset timeouts under unrelated kernel hangs
-
-From: Chris Wilson <chris@chris-wilson.co.uk>
-
-[ Upstream commit 1dab4561a341afdbaafe0ce6091106d0c63c79e0 ]
-
-When resuming after hibernate sometimes we see hangs in unrelated kernel
-subsystems. These hangs often result in the following i915 trace:
-
-i915 0000:00:02.0: [drm] *ERROR* \
-       intel_gt_reset_global timed out, cancelling all in-flight rendering
-
-implying our reset task has been starved by the hanging kernel subsystem,
-causing us to inappropiately declare the system as wedged beyond recovery.
-
-The trace would be caused by our synchronize_srcu_expedited() taking more
-than the allowed 5s due to the unrelated kernel hang. But we neither need
-to perform that synchronisation inside the reset watchdog, nor do we need
-such a short timeout before declaring the device as unrecoverable.
-
-v2: Restore watchdog timeout to the previous 5 seconds (Ashutosh)
-
-Bug: https://gitlab.freedesktop.org/drm/intel/-/issues/3575
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
-Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
-Signed-off-by: Matthew Auld <matthew.auld@intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20220630043959.5708-1-ashutosh.dixit@intel.com
-Stable-dep-of: 774ce1510e6c ("drm/i915/guc: support v69 in parallel to v70")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/i915/gt/intel_reset.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
-index c68d36fb5bbd..1211774e1d91 100644
---- a/drivers/gpu/drm/i915/gt/intel_reset.c
-+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
-@@ -1281,9 +1281,6 @@ static void intel_gt_reset_global(struct intel_gt *gt,
-       intel_wedge_on_timeout(&w, gt, 5 * HZ) {
-               intel_display_prepare_reset(gt->i915);
- 
--              /* Flush everyone using a resource about to be clobbered */
--              synchronize_srcu_expedited(&gt->reset.backoff_srcu);
--
-               intel_gt_reset(gt, engine_mask, reason);
- 
-               intel_display_finish_reset(gt->i915);
-@@ -1392,6 +1389,9 @@ void intel_gt_handle_error(struct intel_gt *gt,
-               }
-       }
- 
-+      /* Flush everyone using a resource about to be clobbered */
-+      synchronize_srcu_expedited(&gt->reset.backoff_srcu);
-+
-       intel_gt_reset_global(gt, engine_mask, msg);
- 
-       if (!intel_uc_uses_guc_submission(&gt->uc)) {
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 52d88e5dfab42820640d26486e0ab68d35c63abd..493c74d7de17b231908b3fc2f9d57b1d445aa54f 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -359,7 +359,6 @@ video-aperture-disable-and-unregister-sysfb-devices-.patch
 drm-virtio-correct-drm_gem_shmem_get_sg_table-error-.patch
 drm-bridge-anx7625-fix-refcount-bug-in-anx7625_parse.patch
 drm-bridge-tc358767-add-of_node_put-when-breaking-ou.patch
-drm-i915-reset-handle-reset-timeouts-under-unrelated.patch
 drm-bridge-parade-ps8640-fix-regulator-supply-order.patch
 drm-format-helper-fix-test-on-big-endian-architectur.patch
 drm-dp_mst-fix-drm_dp_dpcd_read-return-value-checks.patch