public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Stuart Summers <stuart.summers@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/3] drm/i915: Use render class for MI_SET_CONTEXT
Date: Tue, 13 Aug 2019 10:41:19 -0700	[thread overview]
Message-ID: <20190813174121.129593-1-stuart.summers@intel.com> (raw)

Replace GEM_BUG_ON with explicit check for render class
when doing the kernel context switch.

Signed-off-by: Stuart Summers <stuart.summers@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
index 409d764f8c6d..04ea9bbb88ce 100644
--- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
@@ -1781,9 +1781,7 @@ static int switch_context(struct i915_request *rq)
 		}
 	}
 
-	if (rq->hw_context->state) {
-		GEM_BUG_ON(engine->id != RCS0);
-
+	if (engine->class == RENDER_CLASS && rq->hw_context->state) {
 		/*
 		 * The kernel context(s) is treated as pure scratch and is not
 		 * expected to retain any state (as we sacrifice it during
-- 
2.22.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2019-08-13 17:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-13 17:41 Stuart Summers [this message]
2019-08-13 17:41 ` [PATCH 2/3] drm/i915: Print CCID for all renderCS Stuart Summers
2019-08-13 17:55   ` Chris Wilson
2019-08-14  9:02     ` Chris Wilson
2019-08-14 21:59       ` Stuart Summers
2019-08-13 17:41 ` [PATCH 3/3] drm/i915: Add module parameter to remove RCS engine Stuart Summers
2019-08-13 18:03   ` Chris Wilson
2019-08-13 18:11     ` Chris Wilson
2019-08-13 17:54 ` [PATCH 1/3] drm/i915: Use render class for MI_SET_CONTEXT Chris Wilson
2019-08-13 18:00   ` Stuart Summers
2019-08-13 18:05     ` Chris Wilson
2019-08-13 18:41 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] " Patchwork
2019-08-13 19:03 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-14  6:03 ` ✗ Fi.CI.IGT: failure " Patchwork

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=20190813174121.129593-1-stuart.summers@intel.com \
    --to=stuart.summers@intel.com \
    --cc=intel-gfx@lists.freedesktop.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