[PATCH 3/5] drm/i915/uc: Skip GuC HW unwinding if GuC is already dead

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


We should not attempt to unwind GuC hardware/firmware setup
if we already have sanitized GuC.

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/intel_uc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 7782db4b8711..28b257a36958 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -465,6 +465,9 @@ void intel_uc_fini_hw(struct drm_i915_private *i915)
 
 	GEM_BUG_ON(!HAS_GUC(i915));
 
+	if (!intel_guc_is_alive(guc))
+		return;
+
 	if (USES_GUC_SUBMISSION(i915))
 		intel_guc_submission_disable(guc);
 
-- 
2.19.2



More information about the Intel-gfx-trybot mailing list