Commit 01f8f33e authored by Chris Wilson's avatar Chris Wilson

drm/i915: Always retire residual requests before suspend

If the driver is wedged, we skip idling the GPU. However, we may still
have a few requests still not retired following the wedging (since they
will be waiting for a background worker trying to acquire struct_mutex).
As we hold the struct_mutex, always do a quick request retirement in
order to flush the wedged path.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107257Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180717084121.28185-1-chris@chris-wilson.co.uk
parent a8bd3b88
...@@ -5074,6 +5074,8 @@ int i915_gem_suspend(struct drm_i915_private *i915) ...@@ -5074,6 +5074,8 @@ int i915_gem_suspend(struct drm_i915_private *i915)
assert_kernel_context_is_current(i915); assert_kernel_context_is_current(i915);
} }
i915_retire_requests(i915); /* ensure we flush after wedging */
mutex_unlock(&i915->drm.struct_mutex); mutex_unlock(&i915->drm.struct_mutex);
intel_uc_suspend(i915); intel_uc_suspend(i915);
......
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