[Intel-gfx] [PATCH 1/3] drm/i915: Use render class for MI_SET_CONTEXT

Stuart Summers stuart.summers at intel.com
Tue Aug 13 17:41:19 UTC 2019


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

Signed-off-by: Stuart Summers <stuart.summers at 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



More information about the Intel-gfx mailing list