[PATCH 5/5] drm/i915/uc: Don't forget to prepare GuC for the reset

Michal Wajdeczko michal.wajdeczko at intel.com
Mon May 6 16:02:35 UTC 2019


When we reset engines using ALL_ENGINES mask, we will do
full GPU reset and GuC will be also affected. Let GuC be
prepared for upcoming reset.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
---
 drivers/gpu/drm/i915/gt/intel_reset.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 419b3415370b..0ec7db08256d 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -544,6 +544,10 @@ static int gen8_reset_engines(struct drm_i915_private *i915,
 	intel_engine_mask_t tmp;
 	int ret;
 
+	/* We are about to do full GPU reset, don't forget about GuC */
+	if (engine_mask == ALL_ENGINES)
+		intel_uc_reset_prepare(i915);
+
 	for_each_engine_masked(engine, i915, engine_mask, tmp) {
 		ret = gen8_engine_reset_prepare(engine);
 		if (ret && !reset_non_ready)
-- 
2.19.2



More information about the Intel-gfx-trybot mailing list