drm/i915/guc: Retry GuC load for all load failures
authorRobert M. Fosha <robert.m.fosha@intel.com>
Fri, 29 Mar 2019 23:17:46 +0000 (16:17 -0700)
committerChris Wilson <chris@chris-wilson.co.uk>
Sat, 30 Mar 2019 08:02:07 +0000 (08:02 +0000)
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>
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/20190329231746.9129-1-robert.m.fosha@intel.com
drivers/gpu/drm/i915/intel_uc.c

index 2d360d53757fe6d3c8167cf59b9196b33d8820f4..25b80ffe71adf8649bb985da73fe9b68a5cf0e8c 100644 (file)
@@ -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 "