From d85e516b7629620eb5971c266bc8e290c7cedd2c Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Mon, 4 Jun 2012 14:42:53 -0700
Subject: [PATCH] --- yaml --- r: 318591 b: refs/heads/master c:
 f2ef6eb1453a95ce8ab388493793c54a6bedc405 h: refs/heads/master i:   318589:
 d50979186359ead76f1534e959f2f7528e506032   318587:
 1516385501b4c9d10aec3900d854da92b634cd8e   318583:
 2a0f04b88ffa49d70bd90705e6d059a7e6c32907   318575:
 5a36551b75ca32a0300114e124a4acbcb31c0f6a   318559:
 5e1fefb97d4c20e5ec387e171d747f688a126a6f   318527:
 039459af3a1566fc4ffdd141c4c29be1ebaf8c0a   318463:
 ce95fe4fdbe961a8938394a092ad5303fac990b5 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 71cec88b7c02..c3ea7ece87d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9a3906b609c4b546f00483089516c65fb2ff014
+refs/heads/master: f2ef6eb1453a95ce8ab388493793c54a6bedc405
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index c06f50d44a23..3596f3415624 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/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;