Commit 0922f345 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson

drm/i915/uc: Skip GuC HW unwinding if GuC is already dead

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

v2: replace USES_GUC with guc_is_loaded
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190522193203.23932-8-michal.wajdeczko@intel.com
parent f1e6b336
...@@ -460,7 +460,7 @@ void intel_uc_fini_hw(struct drm_i915_private *i915) ...@@ -460,7 +460,7 @@ void intel_uc_fini_hw(struct drm_i915_private *i915)
{ {
struct intel_guc *guc = &i915->guc; struct intel_guc *guc = &i915->guc;
if (!USES_GUC(i915)) if (!intel_guc_is_loaded(guc))
return; return;
GEM_BUG_ON(!HAS_GUC(i915)); GEM_BUG_ON(!HAS_GUC(i915));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment