[PATCH 5/8] hmm

Chris Wilson chris at chris-wilson.co.uk
Sat Dec 28 17:16:15 UTC 2019


---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 8a9412e94c49..17125fe7214a 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -2518,8 +2518,13 @@ static void execlists_context_reset(struct intel_context *ce)
 	execlists_init_reg_state(ce->lrc_reg_state,
 				 ce, ce->engine, ce->ring, false);
 	__execlists_update_reg_state(ce, ce->engine);
+
+	/* Avoid trying to reload the garbage */
 	ce->lrc_reg_state[CTX_CONTEXT_CONTROL] |=
 		_MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT);
+	if (INTEL_GEN(ce->engine->i915) < 11)
+		ce->lrc_reg_state[CTX_CONTEXT_CONTROL] |=
+			_MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_SAVE_INHIBIT);
 
 	ce->lrc_desc |= CTX_DESC_FORCE_RESTORE;
 }
-- 
2.25.0.rc0



More information about the Intel-gfx-trybot mailing list