diff options
| author | Chris Wilson | 2012-02-24 01:27:21 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2012-02-27 17:32:14 +0100 |
| commit | b67082425350a0a47cde7ebfb7914a72c4c97d0f (patch) | |
| tree | 7d6c9c57dd9324378e67f53f785be3ef2e05d48a /drivers/gpu/drm/i915/i915_gem_evict.c | |
| parent | drm/i915/bios: Downgrade the "signature missing" DRM_ERROR to debug (diff) | |
| download | kernel-qcow2-linux-b67082425350a0a47cde7ebfb7914a72c4c97d0f.tar.gz kernel-qcow2-linux-b67082425350a0a47cde7ebfb7914a72c4c97d0f.tar.xz kernel-qcow2-linux-b67082425350a0a47cde7ebfb7914a72c4c97d0f.zip | |
drm/i915: Only bump refcnt on objects scheduled for eviction
Incrementing the reference count on all objects walked when searching
for space in the aperture is a non-neglible amount of overhead. In fact,
we only need to hold on to a reference for objects that we will evict,
so we can therefore delay the referencing until we find a suitable hole
and only add those objects that fall inside.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_evict.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_evict.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 097119caa36a..6ba4be52936b 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -36,7 +36,6 @@ static bool mark_free(struct drm_i915_gem_object *obj, struct list_head *unwind) { list_add(&obj->exec_list, unwind); - drm_gem_object_reference(&obj->base); return drm_mm_scan_add_block(obj->gtt_space); } @@ -139,7 +138,6 @@ i915_gem_evict_something(struct drm_device *dev, int min_size, BUG_ON(ret); list_del_init(&obj->exec_list); - drm_gem_object_unreference(&obj->base); } /* We expect the caller to unpin, evict all and try again, or give up. @@ -158,10 +156,10 @@ found: exec_list); if (drm_mm_scan_remove_block(obj->gtt_space)) { list_move(&obj->exec_list, &eviction_list); + drm_gem_object_reference(&obj->base); continue; } list_del_init(&obj->exec_list); - drm_gem_object_unreference(&obj->base); } /* Unbinding will emit any required flushes */ |