From: Owain Ainsworth <zerooa@googlemail.com>
Date: Sun, 7 Dec 2008 04:42:20 +0000 (-0800)
Subject: drm/i915: Don't return error in evict_everything when we get to the end.
X-Git-Tag: v2.6.28-rc8~38^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=15c35334c9b7a11f66ddf7fea9367884e1f5414f

drm/i915: Don't return error in evict_everything when we get to the end.

Returning -ENOMEM errored all the way out of execbuf, so the rendering never
occurred.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3fde82be014..ad672d85482 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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;
 }