---

yaml --- r: 318591 b: refs/heads/master c: f2ef6eb h: refs/heads/master i: 318589: d509791 318587: 1516385 318583: 2a0f04b 318575: 5a36551 318559: 5e1fefb 318527: 039459a 318463: ce95fe4 v: v3
git-mirror · Jun 14, 2012 · d85e516 · d85e516
1 parent d8dfef3
commit d85e516
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;