---

yaml --- r: 293553 b: refs/heads/master c: 39965b3 h: refs/heads/master i: 293551: dd3fb1e v: v3
git-mirror · Jan 29, 2012 · 92eeb68 · 92eeb68
1 parent b40a730
commit 92eeb68
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: 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
@@ -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)