Commit 40d211ef authored by Fernando Pacheco's avatar Fernando Pacheco Committed by Chris Wilson

Revert "drm/i915/guc: Disable global reset"

We have now prepared the guc reset paths to avoid taking struct_mutex, or
any other lock, and so it is now safe to re-enable.

References: fe62365f ("drm/i915/guc: Disable global reset")
Signed-off-by: default avatarFernando Pacheco <fernando.pacheco@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190419230015.18121-5-fernando.pacheco@intel.com
parent fc488b59
...@@ -641,9 +641,6 @@ int intel_gpu_reset(struct drm_i915_private *i915, ...@@ -641,9 +641,6 @@ int intel_gpu_reset(struct drm_i915_private *i915,
bool intel_has_gpu_reset(struct drm_i915_private *i915) bool intel_has_gpu_reset(struct drm_i915_private *i915)
{ {
if (USES_GUC(i915))
return false;
if (!i915_modparams.reset) if (!i915_modparams.reset)
return NULL; return NULL;
......
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