drm/i915: Combine unbound/bound list tracking for objects

[linux.git] / drivers / gpu / drm / i915 / gem / i915_gem_pages.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
index 7ff907d6d0c6f2e4f2cddb6b0d42b11573dda084..b36ad269f4ead8266f7355e0ee647abd8af507ad 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -57,13 +57,19 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj,
        GEM_BUG_ON(!HAS_PAGE_SIZES(i915, obj->mm.page_sizes.sg));
 
        if (i915_gem_object_is_shrinkable(obj)) {
+               struct list_head *list;
                unsigned long flags;
 
                spin_lock_irqsave(&i915->mm.obj_lock, flags);
 
                i915->mm.shrink_count++;
                i915->mm.shrink_memory += obj->base.size;
-               list_add(&obj->mm.link, &i915->mm.unbound_list);
+
+               if (obj->mm.madv != I915_MADV_WILLNEED)
+                       list = &i915->mm.purge_list;
+               else
+                       list = &i915->mm.shrink_list;
+               list_add_tail(&obj->mm.link, list);
 
                spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
        }
@@ -193,7 +199,7 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj,
        if (i915_gem_object_has_pinned_pages(obj))
                return -EBUSY;
 
-       GEM_BUG_ON(obj->bind_count);
+       GEM_BUG_ON(atomic_read(&obj->bind_count));
 
        /* May be called by shrinker from within get_pages() (on another bo) */
        mutex_lock_nested(&obj->mm.lock, subclass);