drm/i915: introduce vm set_pages/clear_pages

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / i915 / selftests / mock_gtt.c

diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.c b/drivers/gpu/drm/i915/selftests/mock_gtt.c
index f2118cf535a053926254a523474be87dc5789142..336e1afb250f68147da22be96e8d9b87a3e76595 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.c
@@ -43,7 +43,6 @@ static int mock_bind_ppgtt(struct i915_vma *vma,
                           u32 flags)
 {
        GEM_BUG_ON(flags & I915_VMA_GLOBAL_BIND);
-       vma->pages = vma->obj->mm.pages;
        vma->flags |= I915_VMA_LOCAL_BIND;
        return 0;
 }
@@ -84,6 +83,8 @@ mock_ppgtt(struct drm_i915_private *i915,
        ppgtt->base.insert_entries = mock_insert_entries;
        ppgtt->base.bind_vma = mock_bind_ppgtt;
        ppgtt->base.unbind_vma = mock_unbind_ppgtt;
+       ppgtt->base.set_pages = ppgtt_set_pages;
+       ppgtt->base.clear_pages = clear_pages;
        ppgtt->base.cleanup = mock_cleanup;
 
        return ppgtt;
@@ -93,12 +94,6 @@ static int mock_bind_ggtt(struct i915_vma *vma,
                          enum i915_cache_level cache_level,
                          u32 flags)
 {
-       int err;
-
-       err = i915_get_ggtt_vma_pages(vma);
-       if (err)
-               return err;
-
        vma->flags |= I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND;
        return 0;
 }
@@ -124,6 +119,8 @@ void mock_init_ggtt(struct drm_i915_private *i915)
        ggtt->base.insert_entries = mock_insert_entries;
        ggtt->base.bind_vma = mock_bind_ggtt;
        ggtt->base.unbind_vma = mock_unbind_ggtt;
+       ggtt->base.set_pages = ggtt_set_pages;
+       ggtt->base.clear_pages = clear_pages;
        ggtt->base.cleanup = mock_cleanup;
 
        i915_address_space_init(&ggtt->base, i915, "global");