diff options
| author | Michal Wajdeczko | 2019-05-22 21:32:01 +0200 |
|---|---|---|
| committer | Chris Wilson | 2019-05-23 22:58:36 +0200 |
| commit | 0922f3459f6d4e15bbc325d3030021f1053c2b8f (patch) | |
| tree | 41e6cb93e0c5146eb7ba6055a6a116718d5b2242 /drivers/gpu/drm/i915/intel_uc.c | |
| parent | drm/i915/uc: Use GuC firmware status helper (diff) | |
| download | kernel-qcow2-linux-0922f3459f6d4e15bbc325d3030021f1053c2b8f.tar.gz kernel-qcow2-linux-0922f3459f6d4e15bbc325d3030021f1053c2b8f.tar.xz kernel-qcow2-linux-0922f3459f6d4e15bbc325d3030021f1053c2b8f.zip | |
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: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190522193203.23932-8-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 1a945f61cf69..3d81a512e5c8 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -460,7 +460,7 @@ void intel_uc_fini_hw(struct drm_i915_private *i915) { struct intel_guc *guc = &i915->guc; - if (!USES_GUC(i915)) + if (!intel_guc_is_loaded(guc)) return; GEM_BUG_ON(!HAS_GUC(i915)); |