From cb31c5075f7e7fab77b795c6ec8a084ecc91f23f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 19 Jul 2011 16:21:40 -0700
Subject: [PATCH] --- yaml --- r: 262511 b: refs/heads/master c:
 f0b69efc29b024747a88ce020dada425e3193d5a h: refs/heads/master i:   262509:
 41310f0d0735a9b3ebc3637a3b420e8c4b284d4f   262507:
 5ba794fe4350e8a774414aff917a0723a31e13fe   262503:
 3ff591f79029ff8957b1f893fbd18a807c0949ac   262495:
 80ebc0cb22e7950b215822a1c2c3b5324d849fa6 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 c1368dd1af0d..1deec9ec600d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5071c2fd91f320bc40952df59517053a7346fa9
+refs/heads/master: f0b69efc29b024747a88ce020dada425e3193d5a
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index e9d1d5c3a696..e46f2734acc5 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3113,7 +3113,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
 
 	if (pipelined != obj->ring) {
 		ret = i915_gem_object_wait_rendering(obj);
-		if (ret)
+		if (ret == -ERESTARTSYS)
 			return ret;
 	}