[PATCH 1/6] drm/i915: Supply the extended state flags for forced context load

Chris Wilson chris at chris-wilson.co.uk
Wed Jun 13 17:56:41 UTC 2018


Provide the extended state (or resource streamer bits for Haswell) flags
when doing a forced restore of the current context by temporarily loading
the kernel context.

Fixes: 1fc719d13ac0 ("drm/i915/ringbuffer: Brute force context restore")
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
Cc: Matthew Auld <matthew.william.auld at gmail.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
 drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index dda671e0a680..4a9f44c61edd 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1556,7 +1556,7 @@ static inline int mi_set_context(struct i915_request *rq, u32 flags)
 		*cs++ = MI_SET_CONTEXT;
 		*cs++ = i915_ggtt_offset(to_intel_context(i915->kernel_context,
 							  engine)->state) |
-			MI_MM_SPACE_GTT |
+			flags |
 			MI_RESTORE_INHIBIT;
 	}
 
-- 
2.17.1



More information about the Intel-gfx-trybot mailing list