Commit f2ef6eb1 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter

drm/i915: switch to default context on idle

To keep things as sane as possible, switch to the default context before
idling. This should help free context objects, as well as put things in
a more well defined state before suspending.

v2: remove seqno from context switch call (daniel)
return error on failed context switch instead of WARN+continue (daniel)

v3: move idling to i915_gpu idle (from i915_gem_idle) (Chris)
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
parent b9a3906b
...@@ -2332,6 +2332,10 @@ int i915_gpu_idle(struct drm_device *dev) ...@@ -2332,6 +2332,10 @@ int i915_gpu_idle(struct drm_device *dev)
/* Is the device fubar? */ /* Is the device fubar? */
if (WARN_ON(!list_empty(&ring->gpu_write_list))) if (WARN_ON(!list_empty(&ring->gpu_write_list)))
return -EBUSY; return -EBUSY;
ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
if (ret)
return ret;
} }
return 0; return 0;
......
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