Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Welty <brian.welty@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 2/2] tests/xe/exec_reset: Fix cm-gt-reset
Date: Fri,  1 Dec 2023 13:00:13 -0800	[thread overview]
Message-ID: <20231201210013.16147-3-brian.welty@intel.com> (raw)
In-Reply-To: <20231201210013.16147-1-brian.welty@intel.com>

With use of GT_RESET and forcing GT reset, it is expected for the
xe_wait_ufence to expire. Move the assertion checking into the IGT
by using _xe_wait_ufence().

Signed-off-by: Brian Welty <brian.welty@intel.com>
---
 tests/intel/xe_exec_reset.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/intel/xe_exec_reset.c b/tests/intel/xe_exec_reset.c
index 195e62911f..6fed0dd19e 100644
--- a/tests/intel/xe_exec_reset.c
+++ b/tests/intel/xe_exec_reset.c
@@ -612,9 +612,14 @@ test_compute_mode(int fd, struct drm_xe_engine_class_instance *eci,
 		return;
 	}
 
-	for (i = 1; i < n_execs; i++)
-		xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE,
-			       NULL, THREE_SEC);
+	for (i = 1; i < n_execs; i++) {
+		int64_t timeout = THREE_SEC;
+		int err;
+
+		err = _xe_wait_ufence(fd, &data[i].exec_sync, USER_FENCE_VALUE,
+				      NULL, &timeout);
+		igt_assert_eq(err, flags & GT_RESET ? -ETIME : 0);
+	}
 
 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
 	xe_vm_unbind_async(fd, vm, 0, 0, addr, bo_size, sync, 1);
-- 
2.38.0

  parent reply	other threads:[~2023-12-01 21:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-01 21:00 [igt-dev] [PATCH i-g-t 0/2] Fix xe_exec_reset@cm-gt-reset Brian Welty
2023-12-01 21:00 ` [igt-dev] [PATCH i-g-t 1/2] lib/xe_ioctl: Add _xe_wait_ufence() Brian Welty
2023-12-04 13:09   ` Kamil Konieczny
2023-12-01 21:00 ` Brian Welty [this message]
2023-12-04  3:30   ` [igt-dev] [PATCH i-g-t 2/2] tests/xe/exec_reset: Fix cm-gt-reset Mishra, Pallavi
2023-12-01 22:11 ` [igt-dev] ✓ Fi.CI.BAT: success for Fix xe_exec_reset@cm-gt-reset Patchwork
2023-12-01 22:28 ` [igt-dev] ✓ CI.xeBAT: " Patchwork
2023-12-03  4:03 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231201210013.16147-3-brian.welty@intel.com \
    --to=brian.welty@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox