Commit c4a89526 authored by Michel Thierry's avatar Michel Thierry Committed by Joonas Lahtinen

drm/i915/guc: Clear enable_guc_loading in case of init failure

And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
failed, and the second time during driver unload / intel_uc_fini_hw),
and hitting the GEM_BUG_ON.

v2: Clear enable_guc_loading unconditionally (Michal)
    Make sure guc_free_load_err_log is still called (Daniele)
    Don't shoot the messenger (Chris)

Fixes: 3950bf3d ("drm/i915/guc: Add onion teardown to the GuC
setup")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170605171251.9905-1-michel.thierry@intel.com
parent d5553c09
...@@ -433,16 +433,19 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) ...@@ -433,16 +433,19 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
DRM_NOTE("Falling back from GuC submission to execlist mode\n"); DRM_NOTE("Falling back from GuC submission to execlist mode\n");
} }
i915.enable_guc_loading = 0;
DRM_NOTE("GuC firmware loading disabled\n");
return ret; return ret;
} }
void intel_uc_fini_hw(struct drm_i915_private *dev_priv) void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
{ {
guc_free_load_err_log(&dev_priv->guc);
if (!i915.enable_guc_loading) if (!i915.enable_guc_loading)
return; return;
guc_free_load_err_log(&dev_priv->guc);
if (i915.enable_guc_submission) if (i915.enable_guc_submission)
i915_guc_submission_disable(dev_priv); i915_guc_submission_disable(dev_priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment