From 67eadd3f66253363d2fbf4517f7f1887cc73153c Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 24 Feb 2012 00:27:22 +0000
Subject: [PATCH] --- yaml --- r: 293824 b: refs/heads/master c:
 70424970b4be72acd3bfbde36f7a262e0c676f96 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_evict.c | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index b93ec1e20755..8293fe490cdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b67082425350a0a47cde7ebfb7914a72c4c97d0f
+refs/heads/master: 70424970b4be72acd3bfbde36f7a262e0c676f96
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_evict.c b/trunk/drivers/gpu/drm/i915/i915_gem_evict.c
index 6ba4be52936b..21a82710f4b2 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -48,21 +48,6 @@ i915_gem_evict_something(struct drm_device *dev, int min_size,
 	struct drm_i915_gem_object *obj;
 	int ret = 0;
 
-	i915_gem_retire_requests(dev);
-
-	/* Re-check for free space after retiring requests */
-	if (mappable) {
-		if (drm_mm_search_free_in_range(&dev_priv->mm.gtt_space,
-						min_size, alignment, 0,
-						dev_priv->mm.gtt_mappable_end,
-						0))
-			return 0;
-	} else {
-		if (drm_mm_search_free(&dev_priv->mm.gtt_space,
-				       min_size, alignment, 0))
-			return 0;
-	}
-
 	trace_i915_gem_evict(dev, min_size, alignment, mappable);
 
 	/*