| Message ID | 20190329231746.9129-1-robert.m.fosha@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915/guc: Retry GuC load for all load failures | expand |
Quoting Robert M. Fosha (2019-03-29 23:17:46) > 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. Worst case is we get the same error 3 times before giving up. > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108593 > Signed-off-by: Robert M. Fosha <robert.m.fosha@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
Quoting Chris Wilson (2019-03-30 08:01:28) > Quoting Robert M. Fosha (2019-03-29 23:17:46) > > 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. > > Worst case is we get the same error 3 times before giving up. > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108593 > > Signed-off-by: Robert M. Fosha <robert.m.fosha@intel.com> > > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> And pushed, thanks for the fix. -Chris
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 2d360d53757f..25b80ffe71ad 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -375,7 +375,7 @@ int intel_uc_init_hw(struct drm_i915_private *i915) intel_guc_init_params(guc); ret = intel_guc_fw_upload(guc); - if (ret == 0 || ret != -ETIMEDOUT) + if (ret == 0) break; DRM_DEBUG_DRIVER("GuC fw load failed: %d; will reset and "
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=108593 Signed-off-by: Robert M. Fosha <robert.m.fosha@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> --- drivers/gpu/drm/i915/intel_uc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)