diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-23 19:27:22 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-27 11:37:13 -0500 |
commit | 70424970b4be72acd3bfbde36f7a262e0c676f96 (patch) | |
tree | 5067b4ab3b135405bc2727d310079993040f1518 /drivers | |
parent | b67082425350a0a47cde7ebfb7914a72c4c97d0f (diff) |
drm/i915: No need to search again after retiring requests
Retiring requests does not typically free up space in the aperture,
so the additional search is pointless.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_evict.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 6ba4be52936b..21a82710f4b2 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c | |||
@@ -48,21 +48,6 @@ i915_gem_evict_something(struct drm_device *dev, int min_size, | |||
48 | struct drm_i915_gem_object *obj; | 48 | struct drm_i915_gem_object *obj; |
49 | int ret = 0; | 49 | int ret = 0; |
50 | 50 | ||
51 | i915_gem_retire_requests(dev); | ||
52 | |||
53 | /* Re-check for free space after retiring requests */ | ||
54 | if (mappable) { | ||
55 | if (drm_mm_search_free_in_range(&dev_priv->mm.gtt_space, | ||
56 | min_size, alignment, 0, | ||
57 | dev_priv->mm.gtt_mappable_end, | ||
58 | 0)) | ||
59 | return 0; | ||
60 | } else { | ||
61 | if (drm_mm_search_free(&dev_priv->mm.gtt_space, | ||
62 | min_size, alignment, 0)) | ||
63 | return 0; | ||
64 | } | ||
65 | |||
66 | trace_i915_gem_evict(dev, min_size, alignment, mappable); | 51 | trace_i915_gem_evict(dev, min_size, alignment, mappable); |
67 | 52 | ||
68 | /* | 53 | /* |