Merge drm/drm-next into drm-intel-gt-next

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / i915 / gem / i915_gem_ttm.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 97e648f..a878910 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -293,7 +293,7 @@ static struct ttm_tt *i915_ttm_tt_create(struct ttm_buffer_object *bo,
                i915_tt->is_shmem = true;
        }
 
-       ret = ttm_tt_init(&i915_tt->ttm, bo, page_flags, caching);
+       ret = ttm_tt_init(&i915_tt->ttm, bo, page_flags, caching, 0);
        if (ret)
                goto err_free;
 
@@ -947,7 +947,7 @@ void i915_ttm_adjust_lru(struct drm_i915_gem_object *obj)
                        bo->priority = I915_TTM_PRIO_HAS_PAGES;
        }
 
-       ttm_bo_move_to_lru_tail(bo, bo->resource, NULL);
+       ttm_bo_move_to_lru_tail(bo);
        spin_unlock(&bo->bdev->lru_lock);
 }