[PATCH 08/10] drm/i915/uc: Return EIO on FW load failure
Michał Winiarski
michal.winiarski at intel.com
Tue Jul 17 16:41:25 UTC 2018
Rather than failing the probe, we should simply leave the driver in a
wedged state, similar to what we're doing in non-guc world.
Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
drivers/gpu/drm/i915/i915_gem.c | 10 ++++++----
drivers/gpu/drm/i915/intel_uc.c | 8 +++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 94f98741366a..9409ae4d851b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5485,7 +5485,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
ret = intel_uc_init_misc(dev_priv);
if (ret)
- return ret;
+ goto err_userptr;
ret = intel_wopcm_init(&dev_priv->wopcm);
if (ret)
@@ -5575,7 +5575,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);
@@ -5590,8 +5591,9 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
mutex_unlock(&dev_priv->drm.struct_mutex);
err_uc_misc:
- intel_uc_fini_misc(dev_priv);
-
+ if (ret != -EIO)
+ intel_uc_fini_misc(dev_priv);
+err_userptr:
if (ret != -EIO)
i915_gem_cleanup_userptr(dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index ffa81912387c..96c928f1b2f4 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -420,15 +420,13 @@ int intel_uc_init_hw(struct drm_i915_private *i915)
err_log_capture:
guc_capture_load_err_log(guc);
err_out:
+ dev_err(i915->drm.dev, "GuC initialization failed %d\n", ret);
+
/*
* 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.
*/
- 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.17.1
More information about the Intel-gfx-trybot
mailing list