---

yaml --- r: 119773 b: refs/heads/master c: 15c3533 h: refs/heads/master i: 119771: 097be46 v: v3
git-mirror · Dec 9, 2008 · e0b473a · e0b473a
1 parent fed8d0a
commit e0b473a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fae7043c65d65f3e5b34bac4431c6ccc49190c41
+refs/heads/master: 15c35334c9b7a11f66ddf7fea9367884e1f5414f
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1104,6 +1104,8 @@ i915_gem_evict_everything(struct drm_device *dev)
 		if (ret != 0)
 			break;
 	}
+	if (ret == -ENOMEM)
+		return 0;
 	return ret;
 }