[igt-dev] [i-g-t V3 3/6] tests/kms_flip: Allow hang tests to run on XE

[Bhanuprakash Modem <bhanuprakash.modem@intel.com>]

As hang tests supports both i915 & XE, update the intel specific
checks to allow them to run on XE.

Cc: Kunal Joshi <kunal1.joshi@intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/kms_flip.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 23c71cee2..f09a00dd0 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1042,7 +1042,10 @@ static bool run_test_step(struct test_output *o, unsigned int *events)
 	memset(&hang, 0, sizeof(hang));
 	if (do_flip && (o->flags & TEST_HANG)) {
 		igt_require_intel(drm_fd);
-		ahnd = get_reloc_ahnd(drm_fd, 0);
+
+		ahnd = is_i915_device(drm_fd) ?
+			get_reloc_ahnd(drm_fd, 0) :
+			intel_allocator_open(drm_fd, 0, INTEL_ALLOCATOR_RELOC);
 		hang = hang_gpu(drm_fd, ahnd);
 	}
 
@@ -1847,8 +1850,9 @@ static void run_test(int duration, int flags)
 	if (flags & TEST_BO_TOOBIG && !is_intel_device(drm_fd))
 		return;
 
-	igt_require((flags & TEST_HANG) == 0 ||
-		    (is_i915_device(drm_fd) && !is_wedged(drm_fd)));
+	if ((flags & TEST_HANG) == 0 && is_i915_device(drm_fd))
+		igt_require(!is_wedged(drm_fd));
+
 	igt_require(!(flags & TEST_FENCE_STRESS) ||
 		    (is_i915_device(drm_fd) && gem_available_fences(drm_fd)));
 
@@ -1923,8 +1927,9 @@ static void run_pair(int duration, int flags)
 	if (flags & TEST_BO_TOOBIG && !is_intel_device(drm_fd))
 		return;
 
-	igt_require((flags & TEST_HANG) == 0 ||
-		    (is_i915_device(drm_fd) && !is_wedged(drm_fd)));
+	if ((flags & TEST_HANG) == 0 && is_i915_device(drm_fd))
+		igt_require(!is_wedged(drm_fd));
+
 	igt_require(!(flags & TEST_FENCE_STRESS) ||
 		    (is_i915_device(drm_fd) && gem_available_fences(drm_fd)));
 
-- 
2.40.0