There is no fallback to execlists, but instead of aborting whole driver load, just mark it as wedged.
Signed-off-by: Michal Wajdeczko <[email protected]> Cc: Daniele Ceraolo Spurio <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Cc: Chris Wilson <[email protected]> --- drivers/gpu/drm/i915/i915_gem.c | 3 ++- drivers/gpu/drm/i915/intel_uc.c | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e506e43cfade..65f7c10b324a 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4947,7 +4947,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv) mutex_lock(&dev_priv->drm.struct_mutex); intel_uc_fini_hw(dev_priv); err_uc_init: - intel_uc_fini(dev_priv); + if (ret != -EIO) + intel_uc_fini(dev_priv); err_pm: if (ret != -EIO) { intel_cleanup_gt_powersave(dev_priv); diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 49b6341f6cb4..b516cc1ff18c 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -439,12 +439,10 @@ int intel_uc_init_hw(struct drm_i915_private *i915) /* * Note that there is no fallback as either user explicitly asked for * the GuC or driver default option was to run with the GuC enabled. + * Return -EIO to just disable GPU submission but keep KMS alive. */ - if (GEM_WARN_ON(ret == -EIO)) - ret = -EINVAL; - dev_err(i915->drm.dev, "GuC initialization failed %d\n", ret); - return ret; + return -EIO; } void intel_uc_fini_hw(struct drm_i915_private *i915) -- 2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
