| Message ID | 20181016085931.23532-1-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915/guc: Fix Gen9 GuC loading workarounds | expand |
On 16/10/18 01:59, Michal Wajdeczko wrote: > In commit 4502e9ec820d ("drm/i915/uc: Unify firmware loading") we > stopped converting errors detected during firmware transfer into > -EAGAIN and this indirectly killed our workarounds for Gen9 GuC. > Reactivate those workarounds by looking for actual -ETIMEDOUT error. > > Testcase: igt@drv_selftest@live_hangcheck > Reported-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > References: commit 4502e9ec820d ("drm/i915/uc: Unify firmware loading") Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/intel_uc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c > index b1b3e81..b34c318 100644 > --- a/drivers/gpu/drm/i915/intel_uc.c > +++ b/drivers/gpu/drm/i915/intel_uc.c > @@ -376,7 +376,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 != -EAGAIN) > + if (ret == 0 || ret != -ETIMEDOUT) > break; > > DRM_DEBUG_DRIVER("GuC fw load failed: %d; will reset and " >
Quoting Daniele Ceraolo Spurio (2018-10-17 00:03:38) > > > On 16/10/18 01:59, Michal Wajdeczko wrote: > > In commit 4502e9ec820d ("drm/i915/uc: Unify firmware loading") we > > stopped converting errors detected during firmware transfer into > > -EAGAIN and this indirectly killed our workarounds for Gen9 GuC. > > Reactivate those workarounds by looking for actual -ETIMEDOUT error. > > > > Testcase: igt@drv_selftest@live_hangcheck > > Reported-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > > References: commit 4502e9ec820d ("drm/i915/uc: Unify firmware loading") > > Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Thanks for the fix and review, pushed. -Chris
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index b1b3e81..b34c318 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -376,7 +376,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 != -EAGAIN) + if (ret == 0 || ret != -ETIMEDOUT) break; DRM_DEBUG_DRIVER("GuC fw load failed: %d; will reset and "
In commit 4502e9ec820d ("drm/i915/uc: Unify firmware loading") we stopped converting errors detected during firmware transfer into -EAGAIN and this indirectly killed our workarounds for Gen9 GuC. Reactivate those workarounds by looking for actual -ETIMEDOUT error. Testcase: igt@drv_selftest@live_hangcheck Reported-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> References: commit 4502e9ec820d ("drm/i915/uc: Unify firmware loading") Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_uc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)