From 8accda1f5303d203919b0cbbdf0ea82ed0455c18 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 24 Feb 2012 00:27:21 +0000 Subject: [PATCH] --- yaml --- r: 293823 b: refs/heads/master c: b67082425350a0a47cde7ebfb7914a72c4c97d0f h: refs/heads/master i: 293821: 6d06a0d6be61248172d23b74ea0a121e9d4ee96e 293819: 3d8778bb03fa147f4a436205c72e6b44cb94aeba 293815: d8b9d9dcbb9da141148714519b262122d7d0f65a 293807: 26f499f9207e85a972a0db357f5fc82dee2f4914 293791: abaad28e2cc2adea50c643791bc754d3f3e43467 293759: fd942a967953c1a43c9b6ff50ab44106b202c7a5 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_evict.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 78a305c83260..b93ec1e20755 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd45545f7405eab9093da84715f19c6385a57662 +refs/heads/master: b67082425350a0a47cde7ebfb7914a72c4c97d0f diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_evict.c b/trunk/drivers/gpu/drm/i915/i915_gem_evict.c index 097119caa36a..6ba4be52936b 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/trunk/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 @@ i915_gem_evict_something(struct drm_device *dev, int min_size, 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 */