[RFC v4 3/8] drm/i915/uc: Don't expect GuC is running during sanitize
Michal Wajdeczko
michal.wajdeczko at intel.com
Fri Jan 11 18:13:29 UTC 2019
WIP
Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
drivers/gpu/drm/i915/intel_uc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index c9e6c0addb38..3eea146b11b7 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -341,11 +341,10 @@ void intel_uc_sanitize(struct drm_i915_private *i915)
if (!USES_GUC(i915))
return;
- GEM_BUG_ON(!HAS_GUC(i915));
-
- guc_disable_communication(guc);
-
- __uc_sanitize(i915);
+ if (intel_guc_is_alive(guc))
+ intel_uc_fini_hw(i915);
+ else
+ __uc_sanitize(i915);
}
int intel_uc_init_hw(struct drm_i915_private *i915)
--
2.19.2
More information about the Intel-gfx-trybot
mailing list