From: Ben Widawsky <ben@bwidawsk.net>
Date: Mon, 4 Jun 2012 21:42:53 +0000 (-0700)
Subject: drm/i915: switch to default context on idle
X-Git-Tag: v3.6-rc1~83^2~42^2~34
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f2ef6eb1453a95ce8ab388493793c54a6bedc405;p=~emulex%2Finfiniband.git

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: Ben Widawsky <ben@bwidawsk.net>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index c06f50d44a2..3596f341562 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2332,6 +2332,10 @@ int i915_gpu_idle(struct drm_device *dev)
 		/* Is the device fubar? */
 		if (WARN_ON(!list_empty(&ring->gpu_write_list)))
 			return -EBUSY;
+
+		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
+		if (ret)
+			return ret;
 	}
 
 	return 0;