dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Brost <matthew.brost@intel.com>
To: <gfx-internal-devel@eclists.intel.com>,
	<dri-devel@lists.freedesktop.org>
Subject: [PATCH 7/9] drm/i915/guc: Don't enable scheduling on a banned context
Date: Wed, 11 Aug 2021 01:16:20 +0000	[thread overview]
Message-ID: <20210811011622.255784-8-matthew.brost@intel.com> (raw)
In-Reply-To: <20210811011622.255784-1-matthew.brost@intel.com>

When unblocking a context, do not enable scheduling if the context is
banned.

Fixes: 62eaf0ae217d ("drm/i915/guc: Support request cancellation")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Cc: <stable@vger.kernel.org>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 4631b15eccaf..da0f8af2c8ab 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -1571,6 +1571,7 @@ static void guc_context_unblock(struct intel_context *ce)
 	spin_lock_irqsave(&ce->guc_state.lock, flags);
 
 	if (unlikely(submission_disabled(guc) ||
+		     intel_context_is_banned(ce) ||
 		     !intel_context_is_pinned(ce) ||
 		     context_pending_disable(ce) ||
 		     context_blocked(ce) > 1)) {
-- 
2.32.0


  parent reply	other threads:[~2021-08-11  1:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11  1:16 [PATCH 0/9] Clean up some CI failures for GuC submission Matthew Brost
2021-08-11  1:16 ` [PATCH 1/9] drm/i915/guc: Fix blocked context accounting Matthew Brost
2021-08-11 10:30   ` Daniel Vetter
2021-08-11 17:28     ` Matthew Brost
2021-08-11  1:16 ` [PATCH 2/9] drm/i915/guc: outstanding G2H accounting Matthew Brost
2021-08-11  1:16 ` [PATCH 3/9] drm/i915/guc: Unwind context requests in reverse order Matthew Brost
2021-08-11  1:16 ` [PATCH 4/9] drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context Matthew Brost
2021-08-11  1:16 ` [PATCH 5/9] drm/i915/guc: Flush the work queue for GuC generated G2H Matthew Brost
2021-08-12 14:11   ` Daniel Vetter
2021-08-12 15:23     ` Matthew Brost
2021-08-12 19:47       ` Daniel Vetter
2021-08-12 22:38         ` Matthew Brost
2021-08-13 15:11           ` Daniel Vetter
2021-08-13 19:02             ` Matthew Brost
2021-08-16 15:39               ` Daniel Vetter
2021-08-11  1:16 ` [PATCH 6/9] drm/i915/guc: Do not clear enable during reset in an enable is inflight Matthew Brost
2021-08-11  1:16 ` Matthew Brost [this message]
2021-08-11  1:16 ` [PATCH 8/9] drm/i915/selftests: Fix memory corruption in live_lrc_isolation Matthew Brost
2021-08-11  1:16 ` [PATCH 9/9] drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H 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=20210811011622.255784-8-matthew.brost@intel.com \
    --to=matthew.brost@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gfx-internal-devel@eclists.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox