Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index ae7c24e12e52d5b4205c34049809f2055e9401db..eba0308f10e3d5cdad1c8c9b71333bfb46c57896 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -78,11 +78,12 @@ i915_gem_evict_something(struct drm_device *dev, int min_size,
 
        INIT_LIST_HEAD(&unwind_list);
        if (mappable)
-               drm_mm_init_scan_with_range(&dev_priv->mm.gtt_space, min_size,
-                                           alignment, 0,
-                                           dev_priv->mm.gtt_mappable_end);
+               drm_mm_init_scan_with_range(&dev_priv->mm.gtt_space,
+                                           min_size, alignment, 0,
+                                           0, dev_priv->mm.gtt_mappable_end);
        else
-               drm_mm_init_scan(&dev_priv->mm.gtt_space, min_size, alignment);
+               drm_mm_init_scan(&dev_priv->mm.gtt_space,
+                                min_size, alignment, 0);
 
        /* First see if there is a large enough contiguous idle region... */
        list_for_each_entry(obj, &dev_priv->mm.inactive_list, mm_list) {