drm/i915: Track unbound pages

[linux-2.6-block.git] / drivers / gpu / drm / i915 / i915_gem_execbuffer.c

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index afb312ee050ca972daf537061c68a1163df51e5a..834a636b44f078eb5c4d3016663f16adf7975c4c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -502,17 +502,12 @@ i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring,
                        }
                }
 
-               if (ret != -ENOSPC || retry > 1)
+               if (ret != -ENOSPC || retry++)
                        return ret;
 
-               /* First attempt, just clear anything that is purgeable.
-                * Second attempt, clear the entire GTT.
-                */
-               ret = i915_gem_evict_everything(ring->dev, retry == 0);
+               ret = i915_gem_evict_everything(ring->dev);
                if (ret)
                        return ret;
-
-               retry++;
        } while (1);
 
 err: