All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Brost <matthew.brost@intel.com>
To: <intel-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org>
Cc: <john.c.harrison@intel.com>, <daniele.ceraolospurio@intel.com>
Subject: [PATCH 07/23] Revert "drm/i915/gt: Propagate change in error status to children on unhold"
Date: Thu,  9 Sep 2021 09:47:28 -0700	[thread overview]
Message-ID: <20210909164744.31249-8-matthew.brost@intel.com> (raw)
In-Reply-To: <20210909164744.31249-1-matthew.brost@intel.com>

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.

References: '3761baae908a ("Revert "drm/i915: Propagate errors on awaiting already signaled fences"")'
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>
---
 drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index aeb324b701ec..87c595e4efe2 100644
--- 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 i915_request *rq)
 			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;
 
-- 
2.32.0


WARNING: multiple messages have this Message-ID (diff)
From: Matthew Brost <matthew.brost@intel.com>
To: <intel-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org>
Cc: <john.c.harrison@intel.com>, <daniele.ceraolospurio@intel.com>
Subject: [Intel-gfx] [PATCH 07/23] Revert "drm/i915/gt: Propagate change in error status to children on unhold"
Date: Thu,  9 Sep 2021 09:47:28 -0700	[thread overview]
Message-ID: <20210909164744.31249-8-matthew.brost@intel.com> (raw)
In-Reply-To: <20210909164744.31249-1-matthew.brost@intel.com>

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.

References: '3761baae908a ("Revert "drm/i915: Propagate errors on awaiting already signaled fences"")'
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>
---
 drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index aeb324b701ec..87c595e4efe2 100644
--- 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 i915_request *rq)
 			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;
 
-- 
2.32.0


  parent reply	other threads:[~2021-09-09 16:53 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-09 16:47 [PATCH 00/23] Clean up GuC CI failures, simplify locking, and kernel DOC Matthew Brost
2021-09-09 16:47 ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 01/23] drm/i915/guc: Fix blocked context accounting Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 02/23] drm/i915/guc: Fix outstanding G2H accounting Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [Intel-gfx] [PATCH 03/23] drm/i915/guc: Unwind context requests in reverse order Matthew Brost
2021-09-09 16:47   ` Matthew Brost
2021-09-09 16:47 ` [Intel-gfx] [PATCH 04/23] drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context Matthew Brost
2021-09-09 16:47   ` Matthew Brost
2021-09-09 16:47 ` [PATCH 05/23] drm/i915/guc: Process all G2H message at once in work queue Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [Intel-gfx] [PATCH 06/23] drm/i915/guc: Workaround reset G2H is received after schedule done G2H Matthew Brost
2021-09-09 16:47   ` Matthew Brost
2021-09-09 16:47 ` Matthew Brost [this message]
2021-09-09 16:47   ` [Intel-gfx] [PATCH 07/23] Revert "drm/i915/gt: Propagate change in error status to children on unhold" Matthew Brost
2021-09-09 16:47 ` [PATCH 08/23] drm/i915/guc: Kick tasklet after queuing a request Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 09/23] drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registered Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 10/23] drm/i915/guc: Copy whole golden context, set engine state size of subset Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 11/23] drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 12/23] drm/i915/guc: Take context ref when cancelling request Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [Intel-gfx] [PATCH 13/23] drm/i915/guc: Don't touch guc_state.sched_state without a lock Matthew Brost
2021-09-09 16:47   ` Matthew Brost
2021-09-09 16:47 ` [PATCH 14/23] drm/i915/guc: Reset LRC descriptor if register returns -ENODEV Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 15/23] drm/i915/guc: Release submit fence from an irq_work Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 16/23] drm/i915/guc: Move guc_blocked fence to struct guc_state Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 17/23] drm/i915/guc: Rework and simplify locking Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 18/23] drm/i915/guc: Proper xarray usage for contexts_lookup Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 19/23] drm/i915/guc: Drop pin count check trick between sched_disable and re-pin Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 20/23] drm/i915/guc: Move GuC priority fields in context under guc_active Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 21/23] drm/i915/guc: Move fields protected by guc->contexts_lock into sub structure Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 22/23] drm/i915/guc: Drop guc_active move everything into guc_state Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 16:47 ` [PATCH 23/23] drm/i915/guc: Add GuC kernel doc Matthew Brost
2021-09-09 16:47   ` [Intel-gfx] " Matthew Brost
2021-09-09 17:23 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Clean up GuC CI failures, simplify locking, and kernel DOC (rev11) Patchwork
2021-09-09 17:24 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-09-09 17:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-09-09 19:13 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-09-10 21:35   ` Matthew Brost

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=20210909164744.31249-8-matthew.brost@intel.com \
    --to=matthew.brost@intel.com \
    --cc=daniele.ceraolospurio@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=john.c.harrison@intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.