public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/i915: Use render class for MI_SET_CONTEXT
@ 2019-08-13 17:41 Stuart Summers
  2019-08-13 17:41 ` [PATCH 2/3] drm/i915: Print CCID for all renderCS Stuart Summers
                   ` (5 more replies)
  0 siblings, 6 replies; 14+ messages in thread
From: Stuart Summers @ 2019-08-13 17:41 UTC (permalink / raw)
  To: intel-gfx

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

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2019-08-14 21:58 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-13 17:41 [PATCH 1/3] drm/i915: Use render class for MI_SET_CONTEXT Stuart Summers
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox