Hang and heartbeat subtests are not supported with GuC submission
enabled.
Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@xxxxxxxxx>
---
tests/i915/gem_ctx_persistence.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/tests/i915/gem_ctx_persistence.c b/tests/i915/gem_ctx_persistence.c
index 42cf96329..1e122535e 100644
--- a/tests/i915/gem_ctx_persistence.c
+++ b/tests/i915/gem_ctx_persistence.c
@@ -1366,19 +1366,25 @@ igt_main
igt_subtest("hostile")
test_nohangcheck_hostile(i915, &empty_cfg);
- igt_subtest("hang")
- test_nohangcheck_hang(i915, &empty_cfg);
-
- igt_subtest("heartbeat-stop")
- test_noheartbeat_many(i915, 1, 0);
- igt_subtest("heartbeat-hang")
- test_noheartbeat_many(i915, 1, IGT_SPIN_NO_PREEMPTION);
- igt_subtest("heartbeat-many")
- test_noheartbeat_many(i915, 16, 0);
- igt_subtest("heartbeat-close")
- test_noheartbeat_close(i915, 0);
- igt_subtest("heartbeat-hostile")
- test_noheartbeat_close(i915, IGT_SPIN_NO_PREEMPTION);
+
+ igt_subtest_group {
+ igt_fixture
+ igt_skip_on(gem_using_guc_submission(i915));
+
+ igt_subtest("hang")
+ test_nohangcheck_hang(i915, &empty_cfg);
+
+ igt_subtest("heartbeat-stop")
+ test_noheartbeat_many(i915, 1, 0);
+ igt_subtest("heartbeat-hang")
+ test_noheartbeat_many(i915, 1, IGT_SPIN_NO_PREEMPTION);
+ igt_subtest("heartbeat-many")
+ test_noheartbeat_many(i915, 16, 0);
+ igt_subtest("heartbeat-close")
+ test_noheartbeat_close(i915, 0);
+ igt_subtest("heartbeat-hostile")
+ test_noheartbeat_close(i915, IGT_SPIN_NO_PREEMPTION);
+ }
igt_subtest_group {
igt_fixture
--
2.38.1
