From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Matthew Brost <matthew.brost@intel.com>,
Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
John Harrison <John.C.Harrison@Intel.com>
Subject: [PATCH 5.15 11/12] Revert "drm/i915/gt: Propagate change in error status to children on unhold"
Date: Thu, 4 Nov 2021 15:12:37 +0100 [thread overview]
Message-ID: <20211104141159.923851880@linuxfoundation.org> (raw)
In-Reply-To: <20211104141159.551636584@linuxfoundation.org>
From: Matthew Brost <matthew.brost@intel.com>
commit ac653dd7996edf1770959e11a078312928bd7315 upstream.
Propagating errors to dependent fences is broken and can lead to errors
from one client ending up in another. In commit 3761baae908a ("Revert
"drm/i915: Propagate errors on awaiting already signaled fences""), we
attempted to get rid of fence error propagation but missed the case
added in commit 8e9f84cf5cac ("drm/i915/gt: Propagate change in error
status to children on unhold"). Revert that one too. This error was
found by an up-and-coming selftest which triggers a reset during
request cancellation and verifies that subsequent requests complete
successfully.
v2:
(Daniel Vetter)
- Use revert
v3:
(Jason)
- Update commit message
v4 (Daniele):
- fix checkpatch error in commit message.
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210909164744.31249-8-matthew.brost@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 4 ----
1 file changed, 4 deletions(-)
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -2140,10 +2140,6 @@ static void __execlists_unhold(struct i9
if (p->flags & I915_DEPENDENCY_WEAK)
continue;
- /* Propagate any change in error status */
- if (rq->fence.error)
- i915_request_set_error_once(w, rq->fence.error);
-
if (w->engine != rq->engine)
continue;
next prev parent reply other threads:[~2021-11-04 14:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 14:12 [PATCH 5.15 00/12] 5.15.1-rc1 review Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 01/12] sfc: Fix reading non-legacy supported link modes Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 02/12] media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt() Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 03/12] Revert "xhci: Set HCD flag to defer primary roothub registration" Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 04/12] Revert "usb: core: hcd: Add support for deferring " Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 05/12] drm/amdkfd: fix boot failure when iommu is disabled in Picasso Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 06/12] Revert "soc: imx: gpcv2: move reset assert after requesting domain power up" Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 07/12] ARM: 9120/1: Revert "amba: make use of -1 IRQs warn" Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 08/12] Revert "wcn36xx: Disable bmps when encryption is disabled" Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 09/12] drm/amdgpu: revert "Add autodump debugfs node for gpu reset v8" Greg Kroah-Hartman
2021-11-04 14:12 ` [PATCH 5.15 10/12] drm/amd/display: Revert "Directly retrain link from debugfs" Greg Kroah-Hartman
2021-11-04 14:12 ` Greg Kroah-Hartman [this message]
2021-11-04 14:12 ` [PATCH 5.15 12/12] ALSA: usb-audio: Add quirk for Audient iD14 Greg Kroah-Hartman
2021-11-04 19:54 ` [PATCH 5.15 00/12] 5.15.1-rc1 review Shuah Khan
2021-11-04 22:19 ` Florian Fainelli
2021-11-05 2:19 ` Daniel Díaz
2021-11-05 2:26 ` Ken Moffat
2021-11-05 11:30 ` Jon Hunter
2021-11-05 13:01 ` Greg Kroah-Hartman
2021-11-05 15:12 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211104141159.923851880@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=John.C.Harrison@Intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniele.ceraolospurio@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.brost@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox