Commit 52b83260 authored by Robert M. Fosha's avatar Robert M. Fosha Committed by Chris Wilson

drm/i915/guc: Retry GuC load for all load failures

Currently we only retry to load GuC firmware if the load fails due to
timeout. On Gen9 GuC loading may fail for different reasons, not just
hang/timeout. Direction from the GuC team is to retry for all cases of
GuC load failure on Gen9, not just for timeout.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108593Signed-off-by: default avatarRobert M. Fosha <robert.m.fosha@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@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/20190329231746.9129-1-robert.m.fosha@intel.com
parent ee6df569
...@@ -375,7 +375,7 @@ int intel_uc_init_hw(struct drm_i915_private *i915) ...@@ -375,7 +375,7 @@ int intel_uc_init_hw(struct drm_i915_private *i915)
intel_guc_init_params(guc); intel_guc_init_params(guc);
ret = intel_guc_fw_upload(guc); ret = intel_guc_fw_upload(guc);
if (ret == 0 || ret != -ETIMEDOUT) if (ret == 0)
break; break;
DRM_DEBUG_DRIVER("GuC fw load failed: %d; will reset and " DRM_DEBUG_DRIVER("GuC fw load failed: %d; will reset and "
......
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