From 5c308011a6e4e34b3bc38fb8572d9765375f3dae Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 29 Jul 2011 14:45:21 -0700
Subject: [PATCH] --- yaml --- r: 262541 b: refs/heads/master c:
 e0e3fb482105c65ce6f5480a86092e966a29ed79 h: refs/heads/master i:   262539:
 2e9149361527bd048a065987b64309bf478d91d7 v: v3

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

diff --git a/[refs] b/[refs]
index a396cad44cbe..3d6630858a86 100644
--- 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
index a087e1bf0c2f..d5c7c7bccef5 100644
--- 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;
 	}