---

yaml --- r: 262541 b: refs/heads/master c: e0e3fb4 h: refs/heads/master i: 262539: 2e91493 v: v3
git-mirror · Jul 29, 2011 · 5c30801 · 5c30801
1 parent 853286b
commit 5c30801
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b055c8f3ef9f7bc6ba415d900f298d7801a9d1d4
+refs/heads/master: e0e3fb482105c65ce6f5480a86092e966a29ed79
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3019,7 +3019,7 @@ i915_gem_object_set_to_display_plane(struct drm_i915_gem_object *obj,
 	/* Currently, we are always called from an non-interruptible context. */
 	if (pipelined != obj->ring) {
 		ret = i915_gem_object_wait_rendering(obj);
-		if (ret)
+		if (ret == -ERESTARTSYS)
 			return ret;
 	}