summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2020-05-03 16:35:20 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2020-05-03 16:37:32 +0100
commit652a3fd8966345fa5498904ce80a2027a6782783 (patch)
treed0440e99ce5e8044673366e70816bb74c7a5c532 /tests
parent717bc305a46a1d1f9a9e240d1805d47c9d119f07 (diff)
i915/perf_pmu: Move first trial unload to parent
We are not allowed to call igt_skip from the child, so more the first trial module unload into the parent. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/perf_pmu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c
index 5de77da4..d9270efb 100644
--- a/tests/perf_pmu.c
+++ b/tests/perf_pmu.c
@@ -1898,8 +1898,6 @@ static void test_unload(void)
int i915;
int fd;
- igt_debug("Unloading and then re-opening i915 device\n");
- igt_require(unload_i915() == 0);
i915 = __drm_open_driver(DRIVER_INTEL);
igt_debug("Opening perf events\n");
@@ -2203,6 +2201,7 @@ igt_main
}
igt_subtest("module-unload") {
+ igt_require(unload_i915() == 0);
for (int pass = 0; pass < 3; pass++)
test_unload();
}