From 92eeb6827abe508f82791ddf0ef7f511abbb45b4 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 14 Dec 2011 13:57:09 +0100
Subject: [PATCH] --- yaml --- r: 293553 b: refs/heads/master c:
 39965b376601314ba374b8fa3944f5957d4ff2de h: refs/heads/master i:   293551:
 dd3fb1e119a127f17e997546e33eef8e3714ada2 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 4a958f1f5132..b1ca52190c45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1690e1eb7a9021826853e181baa48dd77090da28
+refs/heads/master: 39965b376601314ba374b8fa3944f5957d4ff2de
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index c78930ed2e80..721924150d02 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2566,7 +2566,7 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
 
 	reg = i915_find_fence_reg(dev, pipelined);
 	if (reg == NULL)
-		return -ENOSPC;
+		return -EDEADLK;
 
 	ret = i915_gem_object_flush_fence(obj, pipelined);
 	if (ret)