drm/i915: Mock a GGTT for self-testing

A very simple mockery, just a random manager and timeline. Useful for
inserting objects and ordering retirement; and not much else.

v2: mock_fini_ggtt() to complement mock_init_ggtt().

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170213171558.20942-7-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index d580e2b4081be2e434d56e6d6e2387367dd2de7f..520bcf63d271c8c08f3c6b8e3feb4e3a026218ca 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3757,3 +3757,7 @@ int i915_gem_gtt_insert(struct i915_address_space *vm,
                                           size, alignment, color,
                                           start, end, DRM_MM_INSERT_EVICT);
 }
+
+#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
+#include "selftests/mock_gtt.c"
+#endif

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 15d0a7ccc9d10b9a3bd50ba0294cb1165a9fc573..dbd32b125d15ec531b0de3ec0d7fc32fce560e40 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -26,6 +26,7 @@
 
 #include "mock_gem_device.h"
 #include "mock_gem_object.h"
+#include "mock_gtt.h"
 
 static void mock_device_release(struct drm_device *dev)
 {
@@ -33,6 +34,12 @@ static void mock_device_release(struct drm_device *dev)
 
        i915_gem_drain_freed_objects(i915);
 
+       mutex_lock(&i915->drm.struct_mutex);
+       mock_fini_ggtt(i915);
+       i915_gem_timeline_fini(&i915->gt.global_timeline);
+       mutex_unlock(&i915->drm.struct_mutex);
+
+       kmem_cache_destroy(i915->vmas);
        kmem_cache_destroy(i915->objects);
 
        drm_dev_fini(&i915->drm);
@@ -84,19 +91,43 @@ struct drm_i915_private *mock_gem_device(void)
        i915->drm.pdev = pdev;
        i915->drm.dev_private = i915;
 
+       /* Using the global GTT may ask questions about KMS users, so prepare */
+       drm_mode_config_init(&i915->drm);
+
        mkwrite_device_info(i915)->gen = -1;
 
        spin_lock_init(&i915->mm.object_stat_lock);
 
        INIT_WORK(&i915->mm.free_work, __i915_gem_free_work);
        init_llist_head(&i915->mm.free_list);
+       INIT_LIST_HEAD(&i915->mm.unbound_list);
+       INIT_LIST_HEAD(&i915->mm.bound_list);
 
        i915->objects = KMEM_CACHE(mock_object, SLAB_HWCACHE_ALIGN);
        if (!i915->objects)
                goto put_device;
 
+       i915->vmas = KMEM_CACHE(i915_vma, SLAB_HWCACHE_ALIGN);
+       if (!i915->vmas)
+               goto err_objects;
+
+       mutex_lock(&i915->drm.struct_mutex);
+       INIT_LIST_HEAD(&i915->gt.timelines);
+       err = i915_gem_timeline_init__global(i915);
+       if (err) {
+               mutex_unlock(&i915->drm.struct_mutex);
+               goto err_vmas;
+       }
+
+       mock_init_ggtt(i915);
+       mutex_unlock(&i915->drm.struct_mutex);
+
        return i915;
 
+err_vmas:
+       kmem_cache_destroy(i915->vmas);
+err_objects:
+       kmem_cache_destroy(i915->objects);
 put_device:
        put_device(&pdev->dev);
 err:

diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.c b/drivers/gpu/drm/i915/selftests/mock_gtt.c
new file mode 100644 (file)
index 0000000..a61309c
--- /dev/null
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.c
@@ -0,0 +1,138 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include "mock_gtt.h"
+
+static void mock_insert_page(struct i915_address_space *vm,
+                            dma_addr_t addr,
+                            u64 offset,
+                            enum i915_cache_level level,
+                            u32 flags)
+{
+}
+
+static void mock_insert_entries(struct i915_address_space *vm,
+                               struct sg_table *st,
+                               u64 start,
+                               enum i915_cache_level level, u32 flags)
+{
+}
+
+static int mock_bind_ppgtt(struct i915_vma *vma,
+                          enum i915_cache_level cache_level,
+                          u32 flags)
+{
+       GEM_BUG_ON(flags & I915_VMA_GLOBAL_BIND);
+       vma->pages = vma->obj->mm.pages;
+       vma->flags |= I915_VMA_LOCAL_BIND;
+       return 0;
+}
+
+static void mock_unbind_ppgtt(struct i915_vma *vma)
+{
+}
+
+static void mock_cleanup(struct i915_address_space *vm)
+{
+}
+
+struct i915_hw_ppgtt *
+mock_ppgtt(struct drm_i915_private *i915,
+          const char *name)
+{
+       struct i915_hw_ppgtt *ppgtt;
+
+       ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);
+       if (!ppgtt)
+               return NULL;
+
+       kref_init(&ppgtt->ref);
+       ppgtt->base.i915 = i915;
+       ppgtt->base.total = round_down(U64_MAX, PAGE_SIZE);
+       ppgtt->base.file = ERR_PTR(-ENODEV);
+
+       INIT_LIST_HEAD(&ppgtt->base.active_list);
+       INIT_LIST_HEAD(&ppgtt->base.inactive_list);
+       INIT_LIST_HEAD(&ppgtt->base.unbound_list);
+
+       INIT_LIST_HEAD(&ppgtt->base.global_link);
+       drm_mm_init(&ppgtt->base.mm, 0, ppgtt->base.total);
+       i915_gem_timeline_init(i915, &ppgtt->base.timeline, name);
+
+       ppgtt->base.clear_range = nop_clear_range;
+       ppgtt->base.insert_page = mock_insert_page;
+       ppgtt->base.insert_entries = mock_insert_entries;
+       ppgtt->base.bind_vma = mock_bind_ppgtt;
+       ppgtt->base.unbind_vma = mock_unbind_ppgtt;
+       ppgtt->base.cleanup = mock_cleanup;
+
+       return ppgtt;
+}
+
+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;
+}
+
+static void mock_unbind_ggtt(struct i915_vma *vma)
+{
+}
+
+void mock_init_ggtt(struct drm_i915_private *i915)
+{
+       struct i915_ggtt *ggtt = &i915->ggtt;
+
+       INIT_LIST_HEAD(&i915->vm_list);
+
+       ggtt->base.i915 = i915;
+
+       ggtt->mappable_base = 0;
+       ggtt->mappable_end = 2048 * PAGE_SIZE;
+       ggtt->base.total = 4096 * PAGE_SIZE;
+
+       ggtt->base.clear_range = nop_clear_range;
+       ggtt->base.insert_page = mock_insert_page;
+       ggtt->base.insert_entries = mock_insert_entries;
+       ggtt->base.bind_vma = mock_bind_ggtt;
+       ggtt->base.unbind_vma = mock_unbind_ggtt;
+       ggtt->base.cleanup = mock_cleanup;
+
+       i915_address_space_init(&ggtt->base, i915, "global");
+}
+
+void mock_fini_ggtt(struct drm_i915_private *i915)
+{
+       struct i915_ggtt *ggtt = &i915->ggtt;
+
+       i915_address_space_fini(&ggtt->base);
+}

diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.h b/drivers/gpu/drm/i915/selftests/mock_gtt.h
new file mode 100644 (file)
index 0000000..9a0a833
--- /dev/null
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __MOCK_GTT_H
+#define __MOCK_GTT_H
+
+void mock_init_ggtt(struct drm_i915_private *i915);
+void mock_fini_ggtt(struct drm_i915_private *i915);
+
+struct i915_hw_ppgtt *
+mock_ppgtt(struct drm_i915_private *i915,
+          const char *name);
+
+#endif /* !__MOCK_GTT_H */