drm/i915/selftests: Use correct selfest calls for live tests

This will help in an upcoming patch where the live selftest wrappers
are extended to do more.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: John Harrison <john.c.harrison@Intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220817020511.2180747-2-alan.previn.teres.alexis@intel.com

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
index 13b088cc787eb082a4f6a495b28d5f4b8054f56d..a666d7e610f5fe0cec06793096fe9bdb7753ea3f 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
@@ -434,5 +434,5 @@ int i915_gem_coherency_live_selftests(struct drm_i915_private *i915)
                SUBTEST(igt_gem_coherency),
        };
 
-       return i915_subtests(tests, i915);
+       return i915_live_subtests(tests, i915);
 }

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
index 62c61af77a42b979de5df9e93f88fd761ce8b65e..51ed824b020ceef61c7d9d034814386230f03a7a 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
@@ -476,5 +476,5 @@ int i915_gem_dmabuf_live_selftests(struct drm_i915_private *i915)
                SUBTEST(igt_dmabuf_import_same_driver_lmem_smem),
        };
 
-       return i915_subtests(tests, i915);
+       return i915_live_subtests(tests, i915);
 }

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index 3ced9948a331914f77c00d75645882990906e21f..3cff08f04f6cedbbbcb6b6b65bc0a05a2a8a9daa 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -1844,5 +1844,5 @@ int i915_gem_mman_live_selftests(struct drm_i915_private *i915)
                SUBTEST(igt_mmap_gpu),
        };
 
-       return i915_subtests(tests, i915);
+       return i915_live_subtests(tests, i915);
 }

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c
index fe0a890775e21ad545ac9a758d3d2e4b3ec60520..bdf5bb40ccf1949b385151c21caf2eb4ff17b06c 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c
@@ -95,5 +95,5 @@ int i915_gem_object_live_selftests(struct drm_i915_private *i915)
                SUBTEST(igt_gem_huge),
        };
 
-       return i915_subtests(tests, i915);
+       return i915_live_subtests(tests, i915);
 }

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index ab9f17fc85bcf2682c094d698540100f8df3a912..fb5e6196347925446b7b84eed412aa54ca09eb29 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -2324,5 +2324,5 @@ int i915_gem_gtt_live_selftests(struct drm_i915_private *i915)
 
        GEM_BUG_ON(offset_in_page(to_gt(i915)->ggtt->vm.total));
 
-       return i915_subtests(tests, i915);
+       return i915_live_subtests(tests, i915);
 }

diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
index 88db2e3d81d0bc7204e977c824ddfeedc57049fe..429c6d73b159c330250defd57385e986b45424a1 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_perf.c
+++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
@@ -431,7 +431,7 @@ int i915_perf_live_selftests(struct drm_i915_private *i915)
        if (err)
                return err;
 
-       err = i915_subtests(tests, i915);
+       err = i915_live_subtests(tests, i915);
 
        destroy_empty_config(&i915->perf);
 

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index ec05f578a6985c42bfe4cc8739040b3a2c4c80ac..818a4909c1f354242076d9f1859cfe7931134fe8 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -1821,7 +1821,7 @@ int i915_request_live_selftests(struct drm_i915_private *i915)
        if (intel_gt_is_wedged(to_gt(i915)))
                return 0;
 
-       return i915_subtests(tests, i915);
+       return i915_live_subtests(tests, i915);
 }
 
 static int switch_to_kernel_sync(struct intel_context *ce, int err)

diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c
index 6921ba1280151b8d53de065726b3aae79a1efe6c..e3821398a5b09c6ea6b42eab050bf930aee4a630 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_vma.c
+++ b/drivers/gpu/drm/i915/selftests/i915_vma.c
@@ -1103,5 +1103,5 @@ int i915_vma_live_selftests(struct drm_i915_private *i915)
                SUBTEST(igt_vma_remapped_gtt),
        };
 
-       return i915_subtests(tests, i915);
+       return i915_live_subtests(tests, i915);
 }