drm/i915/selftests: Create a clean GGTT for vma/gtt selftesting

Some tests (e.g. igt_vma_pin1) presume that we have a completely clean
GGTT so that it can probe boundaries without fear that something is
already allocated there. However, the mock device is starting to get
complicated and following similar rules to the live device, i.e. we
can't guarantee that i915->ggtt remains clean, so create a temporary
address_space equivalent to the mock ggtt for the purpose.

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

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index fea8ab14e79de84c664206a101884f14b517df6b..06bde4a273cbd6da9fdd39c559906f67e57ac994 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -1267,27 +1267,35 @@ static int exercise_mock(struct drm_i915_private *i915,
 
 static int igt_mock_fill(void *arg)
 {
-       return exercise_mock(arg, fill_hole);
+       struct i915_ggtt *ggtt = arg;
+
+       return exercise_mock(ggtt->vm.i915, fill_hole);
 }
 
 static int igt_mock_walk(void *arg)
 {
-       return exercise_mock(arg, walk_hole);
+       struct i915_ggtt *ggtt = arg;
+
+       return exercise_mock(ggtt->vm.i915, walk_hole);
 }
 
 static int igt_mock_pot(void *arg)
 {
-       return exercise_mock(arg, pot_hole);
+       struct i915_ggtt *ggtt = arg;
+
+       return exercise_mock(ggtt->vm.i915, pot_hole);
 }
 
 static int igt_mock_drunk(void *arg)
 {
-       return exercise_mock(arg, drunk_hole);
+       struct i915_ggtt *ggtt = arg;
+
+       return exercise_mock(ggtt->vm.i915, drunk_hole);
 }
 
 static int igt_gtt_reserve(void *arg)
 {
-       struct drm_i915_private *i915 = arg;
+       struct i915_ggtt *ggtt = arg;
        struct drm_i915_gem_object *obj, *on;
        LIST_HEAD(objects);
        u64 total;
@@ -1300,11 +1308,12 @@ static int igt_gtt_reserve(void *arg)
 
        /* Start by filling the GGTT */
        for (total = 0;
-            total + 2*I915_GTT_PAGE_SIZE <= i915->ggtt.vm.total;
-            total += 2*I915_GTT_PAGE_SIZE) {
+            total + 2 * I915_GTT_PAGE_SIZE <= ggtt->vm.total;
+            total += 2 * I915_GTT_PAGE_SIZE) {
                struct i915_vma *vma;
 
-               obj = i915_gem_object_create_internal(i915, 2*PAGE_SIZE);
+               obj = i915_gem_object_create_internal(ggtt->vm.i915,
+                                                     2 * PAGE_SIZE);
                if (IS_ERR(obj)) {
                        err = PTR_ERR(obj);
                        goto out;
@@ -1318,20 +1327,20 @@ static int igt_gtt_reserve(void *arg)
 
                list_add(&obj->st_link, &objects);
 
-               vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+               vma = i915_vma_instance(obj, &ggtt->vm, NULL);
                if (IS_ERR(vma)) {
                        err = PTR_ERR(vma);
                        goto out;
                }
 
-               err = i915_gem_gtt_reserve(&i915->ggtt.vm, &vma->node,
+               err = i915_gem_gtt_reserve(&ggtt->vm, &vma->node,
                                           obj->base.size,
                                           total,
                                           obj->cache_level,
                                           0);
                if (err) {
                        pr_err("i915_gem_gtt_reserve (pass 1) failed at %llu/%llu with err=%d\n",
-                              total, i915->ggtt.vm.total, err);
+                              total, ggtt->vm.total, err);
                        goto out;
                }
                track_vma_bind(vma);
@@ -1349,11 +1358,12 @@ static int igt_gtt_reserve(void *arg)
 
        /* Now we start forcing evictions */
        for (total = I915_GTT_PAGE_SIZE;
-            total + 2*I915_GTT_PAGE_SIZE <= i915->ggtt.vm.total;
-            total += 2*I915_GTT_PAGE_SIZE) {
+            total + 2 * I915_GTT_PAGE_SIZE <= ggtt->vm.total;
+            total += 2 * I915_GTT_PAGE_SIZE) {
                struct i915_vma *vma;
 
-               obj = i915_gem_object_create_internal(i915, 2*PAGE_SIZE);
+               obj = i915_gem_object_create_internal(ggtt->vm.i915,
+                                                     2 * PAGE_SIZE);
                if (IS_ERR(obj)) {
                        err = PTR_ERR(obj);
                        goto out;
@@ -1367,20 +1377,20 @@ static int igt_gtt_reserve(void *arg)
 
                list_add(&obj->st_link, &objects);
 
-               vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+               vma = i915_vma_instance(obj, &ggtt->vm, NULL);
                if (IS_ERR(vma)) {
                        err = PTR_ERR(vma);
                        goto out;
                }
 
-               err = i915_gem_gtt_reserve(&i915->ggtt.vm, &vma->node,
+               err = i915_gem_gtt_reserve(&ggtt->vm, &vma->node,
                                           obj->base.size,
                                           total,
                                           obj->cache_level,
                                           0);
                if (err) {
                        pr_err("i915_gem_gtt_reserve (pass 2) failed at %llu/%llu with err=%d\n",
-                              total, i915->ggtt.vm.total, err);
+                              total, ggtt->vm.total, err);
                        goto out;
                }
                track_vma_bind(vma);
@@ -1401,7 +1411,7 @@ static int igt_gtt_reserve(void *arg)
                struct i915_vma *vma;
                u64 offset;
 
-               vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+               vma = i915_vma_instance(obj, &ggtt->vm, NULL);
                if (IS_ERR(vma)) {
                        err = PTR_ERR(vma);
                        goto out;
@@ -1413,18 +1423,18 @@ static int igt_gtt_reserve(void *arg)
                        goto out;
                }
 
-               offset = random_offset(0, i915->ggtt.vm.total,
+               offset = random_offset(0, ggtt->vm.total,
                                       2*I915_GTT_PAGE_SIZE,
                                       I915_GTT_MIN_ALIGNMENT);
 
-               err = i915_gem_gtt_reserve(&i915->ggtt.vm, &vma->node,
+               err = i915_gem_gtt_reserve(&ggtt->vm, &vma->node,
                                           obj->base.size,
                                           offset,
                                           obj->cache_level,
                                           0);
                if (err) {
                        pr_err("i915_gem_gtt_reserve (pass 3) failed at %llu/%llu with err=%d\n",
-                              total, i915->ggtt.vm.total, err);
+                              total, ggtt->vm.total, err);
                        goto out;
                }
                track_vma_bind(vma);
@@ -1450,7 +1460,7 @@ out:
 
 static int igt_gtt_insert(void *arg)
 {
-       struct drm_i915_private *i915 = arg;
+       struct i915_ggtt *ggtt = arg;
        struct drm_i915_gem_object *obj, *on;
        struct drm_mm_node tmp = {};
        const struct invalid_insert {
@@ -1459,8 +1469,8 @@ static int igt_gtt_insert(void *arg)
                u64 start, end;
        } invalid_insert[] = {
                {
-                       i915->ggtt.vm.total + I915_GTT_PAGE_SIZE, 0,
-                       0, i915->ggtt.vm.total,
+                       ggtt->vm.total + I915_GTT_PAGE_SIZE, 0,
+                       0, ggtt->vm.total,
                },
                {
                        2*I915_GTT_PAGE_SIZE, 0,
@@ -1490,7 +1500,7 @@ static int igt_gtt_insert(void *arg)
 
        /* Check a couple of obviously invalid requests */
        for (ii = invalid_insert; ii->size; ii++) {
-               err = i915_gem_gtt_insert(&i915->ggtt.vm, &tmp,
+               err = i915_gem_gtt_insert(&ggtt->vm, &tmp,
                                          ii->size, ii->alignment,
                                          I915_COLOR_UNEVICTABLE,
                                          ii->start, ii->end,
@@ -1505,11 +1515,12 @@ static int igt_gtt_insert(void *arg)
 
        /* Start by filling the GGTT */
        for (total = 0;
-            total + I915_GTT_PAGE_SIZE <= i915->ggtt.vm.total;
+            total + I915_GTT_PAGE_SIZE <= ggtt->vm.total;
             total += I915_GTT_PAGE_SIZE) {
                struct i915_vma *vma;
 
-               obj = i915_gem_object_create_internal(i915, I915_GTT_PAGE_SIZE);
+               obj = i915_gem_object_create_internal(ggtt->vm.i915,
+                                                     I915_GTT_PAGE_SIZE);
                if (IS_ERR(obj)) {
                        err = PTR_ERR(obj);
                        goto out;
@@ -1523,15 +1534,15 @@ static int igt_gtt_insert(void *arg)
 
                list_add(&obj->st_link, &objects);
 
-               vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+               vma = i915_vma_instance(obj, &ggtt->vm, NULL);
                if (IS_ERR(vma)) {
                        err = PTR_ERR(vma);
                        goto out;
                }
 
-               err = i915_gem_gtt_insert(&i915->ggtt.vm, &vma->node,
+               err = i915_gem_gtt_insert(&ggtt->vm, &vma->node,
                                          obj->base.size, 0, obj->cache_level,
-                                         0, i915->ggtt.vm.total,
+                                         0, ggtt->vm.total,
                                          0);
                if (err == -ENOSPC) {
                        /* maxed out the GGTT space */
@@ -1540,7 +1551,7 @@ static int igt_gtt_insert(void *arg)
                }
                if (err) {
                        pr_err("i915_gem_gtt_insert (pass 1) failed at %llu/%llu with err=%d\n",
-                              total, i915->ggtt.vm.total, err);
+                              total, ggtt->vm.total, err);
                        goto out;
                }
                track_vma_bind(vma);
@@ -1552,7 +1563,7 @@ static int igt_gtt_insert(void *arg)
        list_for_each_entry(obj, &objects, st_link) {
                struct i915_vma *vma;
 
-               vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+               vma = i915_vma_instance(obj, &ggtt->vm, NULL);
                if (IS_ERR(vma)) {
                        err = PTR_ERR(vma);
                        goto out;
@@ -1572,7 +1583,7 @@ static int igt_gtt_insert(void *arg)
                struct i915_vma *vma;
                u64 offset;
 
-               vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+               vma = i915_vma_instance(obj, &ggtt->vm, NULL);
                if (IS_ERR(vma)) {
                        err = PTR_ERR(vma);
                        goto out;
@@ -1587,13 +1598,13 @@ static int igt_gtt_insert(void *arg)
                        goto out;
                }
 
-               err = i915_gem_gtt_insert(&i915->ggtt.vm, &vma->node,
+               err = i915_gem_gtt_insert(&ggtt->vm, &vma->node,
                                          obj->base.size, 0, obj->cache_level,
-                                         0, i915->ggtt.vm.total,
+                                         0, ggtt->vm.total,
                                          0);
                if (err) {
                        pr_err("i915_gem_gtt_insert (pass 2) failed at %llu/%llu with err=%d\n",
-                              total, i915->ggtt.vm.total, err);
+                              total, ggtt->vm.total, err);
                        goto out;
                }
                track_vma_bind(vma);
@@ -1609,11 +1620,12 @@ static int igt_gtt_insert(void *arg)
 
        /* And then force evictions */
        for (total = 0;
-            total + 2*I915_GTT_PAGE_SIZE <= i915->ggtt.vm.total;
-            total += 2*I915_GTT_PAGE_SIZE) {
+            total + 2 * I915_GTT_PAGE_SIZE <= ggtt->vm.total;
+            total += 2 * I915_GTT_PAGE_SIZE) {
                struct i915_vma *vma;
 
-               obj = i915_gem_object_create_internal(i915, 2*I915_GTT_PAGE_SIZE);
+               obj = i915_gem_object_create_internal(ggtt->vm.i915,
+                                                     2 * I915_GTT_PAGE_SIZE);
                if (IS_ERR(obj)) {
                        err = PTR_ERR(obj);
                        goto out;
@@ -1627,19 +1639,19 @@ static int igt_gtt_insert(void *arg)
 
                list_add(&obj->st_link, &objects);
 
-               vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
+               vma = i915_vma_instance(obj, &ggtt->vm, NULL);
                if (IS_ERR(vma)) {
                        err = PTR_ERR(vma);
                        goto out;
                }
 
-               err = i915_gem_gtt_insert(&i915->ggtt.vm, &vma->node,
+               err = i915_gem_gtt_insert(&ggtt->vm, &vma->node,
                                          obj->base.size, 0, obj->cache_level,
-                                         0, i915->ggtt.vm.total,
+                                         0, ggtt->vm.total,
                                          0);
                if (err) {
                        pr_err("i915_gem_gtt_insert (pass 3) failed at %llu/%llu with err=%d\n",
-                              total, i915->ggtt.vm.total, err);
+                              total, ggtt->vm.total, err);
                        goto out;
                }
                track_vma_bind(vma);
@@ -1666,17 +1678,25 @@ int i915_gem_gtt_mock_selftests(void)
                SUBTEST(igt_gtt_insert),
        };
        struct drm_i915_private *i915;
+       struct i915_ggtt ggtt;
        int err;
 
        i915 = mock_gem_device();
        if (!i915)
                return -ENOMEM;
 
+       mock_init_ggtt(i915, &ggtt);
+
        mutex_lock(&i915->drm.struct_mutex);
-       err = i915_subtests(tests, i915);
+       err = i915_subtests(tests, &ggtt);
+       mock_device_flush(i915);
        mutex_unlock(&i915->drm.struct_mutex);
 
+       i915_gem_drain_freed_objects(i915);
+
+       mock_fini_ggtt(&ggtt);
        drm_dev_put(&i915->drm);
+
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c
index ffa74290e0547a77f762a890b992277f2459419f..f0a32edfb9b16731f314d2ff849da8955b0b53d6 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_vma.c
+++ b/drivers/gpu/drm/i915/selftests/i915_vma.c
@@ -28,6 +28,7 @@
 
 #include "mock_gem_device.h"
 #include "mock_context.h"
+#include "mock_gtt.h"
 
 static bool assert_vma(struct i915_vma *vma,
                       struct drm_i915_gem_object *obj,
@@ -141,7 +142,8 @@ static int create_vmas(struct drm_i915_private *i915,
 
 static int igt_vma_create(void *arg)
 {
-       struct drm_i915_private *i915 = arg;
+       struct i915_ggtt *ggtt = arg;
+       struct drm_i915_private *i915 = ggtt->vm.i915;
        struct drm_i915_gem_object *obj, *on;
        struct i915_gem_context *ctx, *cn;
        unsigned long num_obj, num_ctx;
@@ -245,7 +247,7 @@ static bool assert_pin_einval(const struct i915_vma *vma,
 
 static int igt_vma_pin1(void *arg)
 {
-       struct drm_i915_private *i915 = arg;
+       struct i915_ggtt *ggtt = arg;
        const struct pin_mode modes[] = {
 #define VALID(sz, fl) { .size = (sz), .flags = (fl), .assert = assert_pin_valid, .string = #sz ", " #fl ", (valid) " }
 #define __INVALID(sz, fl, check, eval) { .size = (sz), .flags = (fl), .assert = (check), .string = #sz ", " #fl ", (invalid " #eval ")" }
@@ -256,30 +258,30 @@ static int igt_vma_pin1(void *arg)
 
                VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | 4096),
                VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | 8192),
-               VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | (i915->ggtt.mappable_end - 4096)),
-               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | (i915->ggtt.mappable_end - 4096)),
-               VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | (i915->ggtt.vm.total - 4096)),
-
-               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | (i915->ggtt.mappable_end - 4096)),
-               INVALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | i915->ggtt.mappable_end),
-               VALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | (i915->ggtt.vm.total - 4096)),
-               INVALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | i915->ggtt.vm.total),
+               VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | (ggtt->mappable_end - 4096)),
+               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | (ggtt->mappable_end - 4096)),
+               VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | (ggtt->vm.total - 4096)),
+
+               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | (ggtt->mappable_end - 4096)),
+               INVALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | ggtt->mappable_end),
+               VALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | (ggtt->vm.total - 4096)),
+               INVALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | ggtt->vm.total),
                INVALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | round_down(U64_MAX, PAGE_SIZE)),
 
                VALID(4096, PIN_GLOBAL),
                VALID(8192, PIN_GLOBAL),
-               VALID(i915->ggtt.mappable_end - 4096, PIN_GLOBAL | PIN_MAPPABLE),
-               VALID(i915->ggtt.mappable_end, PIN_GLOBAL | PIN_MAPPABLE),
-               NOSPACE(i915->ggtt.mappable_end + 4096, PIN_GLOBAL | PIN_MAPPABLE),
-               VALID(i915->ggtt.vm.total - 4096, PIN_GLOBAL),
-               VALID(i915->ggtt.vm.total, PIN_GLOBAL),
-               NOSPACE(i915->ggtt.vm.total + 4096, PIN_GLOBAL),
+               VALID(ggtt->mappable_end - 4096, PIN_GLOBAL | PIN_MAPPABLE),
+               VALID(ggtt->mappable_end, PIN_GLOBAL | PIN_MAPPABLE),
+               NOSPACE(ggtt->mappable_end + 4096, PIN_GLOBAL | PIN_MAPPABLE),
+               VALID(ggtt->vm.total - 4096, PIN_GLOBAL),
+               VALID(ggtt->vm.total, PIN_GLOBAL),
+               NOSPACE(ggtt->vm.total + 4096, PIN_GLOBAL),
                NOSPACE(round_down(U64_MAX, PAGE_SIZE), PIN_GLOBAL),
-               INVALID(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | (i915->ggtt.mappable_end - 4096)),
-               INVALID(8192, PIN_GLOBAL | PIN_OFFSET_FIXED | (i915->ggtt.vm.total - 4096)),
+               INVALID(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | (ggtt->mappable_end - 4096)),
+               INVALID(8192, PIN_GLOBAL | PIN_OFFSET_FIXED | (ggtt->vm.total - 4096)),
                INVALID(8192, PIN_GLOBAL | PIN_OFFSET_FIXED | (round_down(U64_MAX, PAGE_SIZE) - 4096)),
 
-               VALID(8192, PIN_GLOBAL | PIN_OFFSET_BIAS | (i915->ggtt.mappable_end - 4096)),
+               VALID(8192, PIN_GLOBAL | PIN_OFFSET_BIAS | (ggtt->mappable_end - 4096)),
 
 #if !IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)
                /* Misusing BIAS is a programming error (it is not controllable
@@ -287,10 +289,10 @@ static int igt_vma_pin1(void *arg)
                 * However, the tests are still quite interesting for checking
                 * variable start, end and size.
                 */
-               NOSPACE(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | i915->ggtt.mappable_end),
-               NOSPACE(0, PIN_GLOBAL | PIN_OFFSET_BIAS | i915->ggtt.vm.total),
-               NOSPACE(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | (i915->ggtt.mappable_end - 4096)),
-               NOSPACE(8192, PIN_GLOBAL | PIN_OFFSET_BIAS | (i915->ggtt.vm.total - 4096)),
+               NOSPACE(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | ggtt->mappable_end),
+               NOSPACE(0, PIN_GLOBAL | PIN_OFFSET_BIAS | ggtt->vm.total),
+               NOSPACE(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | (ggtt->mappable_end - 4096)),
+               NOSPACE(8192, PIN_GLOBAL | PIN_OFFSET_BIAS | (ggtt->vm.total - 4096)),
 #endif
                { },
 #undef NOSPACE
@@ -306,13 +308,13 @@ static int igt_vma_pin1(void *arg)
         * focusing on error handling of boundary conditions.
         */
 
-       GEM_BUG_ON(!drm_mm_clean(&i915->ggtt.vm.mm));
+       GEM_BUG_ON(!drm_mm_clean(&ggtt->vm.mm));
 
-       obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
+       obj = i915_gem_object_create_internal(ggtt->vm.i915, PAGE_SIZE);
        if (IS_ERR(obj))
                return PTR_ERR(obj);
 
-       vma = checked_vma_instance(obj, &i915->ggtt.vm, NULL);
+       vma = checked_vma_instance(obj, &ggtt->vm, NULL);
        if (IS_ERR(vma))
                goto out;
 
@@ -403,8 +405,8 @@ static unsigned int rotated_size(const struct intel_rotation_plane_info *a,
 
 static int igt_vma_rotate(void *arg)
 {
-       struct drm_i915_private *i915 = arg;
-       struct i915_address_space *vm = &i915->ggtt.vm;
+       struct i915_ggtt *ggtt = arg;
+       struct i915_address_space *vm = &ggtt->vm;
        struct drm_i915_gem_object *obj;
        const struct intel_rotation_plane_info planes[] = {
                { .width = 1, .height = 1, .stride = 1 },
@@ -431,7 +433,7 @@ static int igt_vma_rotate(void *arg)
         * that the page layout within the rotated VMA match our expectations.
         */
 
-       obj = i915_gem_object_create_internal(i915, max_pages * PAGE_SIZE);
+       obj = i915_gem_object_create_internal(vm->i915, max_pages * PAGE_SIZE);
        if (IS_ERR(obj))
                goto out;
 
@@ -602,8 +604,8 @@ static bool assert_pin(struct i915_vma *vma,
 
 static int igt_vma_partial(void *arg)
 {
-       struct drm_i915_private *i915 = arg;
-       struct i915_address_space *vm = &i915->ggtt.vm;
+       struct i915_ggtt *ggtt = arg;
+       struct i915_address_space *vm = &ggtt->vm;
        const unsigned int npages = 1021; /* prime! */
        struct drm_i915_gem_object *obj;
        const struct phase {
@@ -621,7 +623,7 @@ static int igt_vma_partial(void *arg)
         * we are returned the same VMA when we later request the same range.
         */
 
-       obj = i915_gem_object_create_internal(i915, npages*PAGE_SIZE);
+       obj = i915_gem_object_create_internal(vm->i915, npages * PAGE_SIZE);
        if (IS_ERR(obj))
                goto out;
 
@@ -723,17 +725,24 @@ int i915_vma_mock_selftests(void)
                SUBTEST(igt_vma_partial),
        };
        struct drm_i915_private *i915;
+       struct i915_ggtt ggtt;
        int err;
 
        i915 = mock_gem_device();
        if (!i915)
                return -ENOMEM;
 
+       mock_init_ggtt(i915, &ggtt);
+
        mutex_lock(&i915->drm.struct_mutex);
-       err = i915_subtests(tests, i915);
+       err = i915_subtests(tests, &ggtt);
+       mock_device_flush(i915);
        mutex_unlock(&i915->drm.struct_mutex);
 
+       i915_gem_drain_freed_objects(i915);
+
+       mock_fini_ggtt(&ggtt);
        drm_dev_put(&i915->drm);
+
        return err;
 }
-

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 3cda66292e76ffeec81959df099ec36f082b261a..5477ad4a7e7deff1e5d94d9118d6c590e83e6250 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -72,7 +72,7 @@ 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);
+       mock_fini_ggtt(&i915->ggtt);
        mutex_unlock(&i915->drm.struct_mutex);
        WARN_ON(!list_empty(&i915->gt.timelines));
 
@@ -232,7 +232,7 @@ struct drm_i915_private *mock_gem_device(void)
 
        mutex_lock(&i915->drm.struct_mutex);
 
-       mock_init_ggtt(i915);
+       mock_init_ggtt(i915, &i915->ggtt);
 
        mkwrite_device_info(i915)->ring_mask = BIT(0);
        i915->kernel_context = mock_context(i915, NULL);

diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.c b/drivers/gpu/drm/i915/selftests/mock_gtt.c
index 976c862b3842152026d8127c1487950fe6c7e4bb..cd83929fde8e120902b12615463594ee4080c9ae 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.c
@@ -97,9 +97,9 @@ static void mock_unbind_ggtt(struct i915_vma *vma)
 {
 }
 
-void mock_init_ggtt(struct drm_i915_private *i915)
+void mock_init_ggtt(struct drm_i915_private *i915, struct i915_ggtt *ggtt)
 {
-       struct i915_ggtt *ggtt = &i915->ggtt;
+       memset(ggtt, 0, sizeof(*ggtt));
 
        ggtt->vm.i915 = i915;
        ggtt->vm.is_ggtt = true;
@@ -118,13 +118,10 @@ void mock_init_ggtt(struct drm_i915_private *i915)
        ggtt->vm.vma_ops.set_pages   = ggtt_set_pages;
        ggtt->vm.vma_ops.clear_pages = clear_pages;
 
-
        i915_address_space_init(&ggtt->vm, VM_CLASS_GGTT);
 }
 
-void mock_fini_ggtt(struct drm_i915_private *i915)
+void mock_fini_ggtt(struct i915_ggtt *ggtt)
 {
-       struct i915_ggtt *ggtt = &i915->ggtt;
-
        i915_address_space_fini(&ggtt->vm);
 }

diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.h b/drivers/gpu/drm/i915/selftests/mock_gtt.h
index 9a0a833bb545556e9655677154af4367f22c72db..40d544bde1d5cd9afbdc2e61b5142fbca3e0834b 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gtt.h
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.h
@@ -25,8 +25,8 @@
 #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);
+void mock_init_ggtt(struct drm_i915_private *i915, struct i915_ggtt *ggtt);
+void mock_fini_ggtt(struct i915_ggtt *ggtt);
 
 struct i915_hw_ppgtt *
 mock_ppgtt(struct drm_i915_private *i915,