---

yaml --- r: 166002 b: refs/heads/master c: ffed1d0 h: refs/heads/master v: v3
git-mirror · Sep 17, 2009 · d9877b4 · d9877b4
1 parent 843164a
commit d9877b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 078a033f45471c44befd72ccacf3f31d75299dba
+refs/heads/master: ffed1d0920d180962469feb5e14bab7af2e29137
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1751,6 +1751,9 @@ i915_wait_request(struct drm_device *dev, uint32_t seqno)
 
 	BUG_ON(seqno == 0);
 
+	if (dev_priv->mm.wedged)
+		return -EIO;
+
 	if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) {
 		if (IS_IGDNG(dev))
 			ier = I915_READ(DEIER) | I915_READ(GTIER);