Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [i-g-t 1/2] lib/drmtest: Ensure the XE driver is idle before starting a test
@ 2024-07-24  7:05 Bhanuprakash Modem
  2024-07-24  7:05 ` [i-g-t 2/2] HAX: Test rmfb tests in BAT Bhanuprakash Modem
                   ` (13 more replies)
  0 siblings, 14 replies; 18+ messages in thread
From: Bhanuprakash Modem @ 2024-07-24  7:05 UTC (permalink / raw)
  To: igt-dev
  Cc: Bhanuprakash Modem, Matthew Brost, Kamil Konieczny,
	Juha-Pekka Heikkila

Re-use the existing i915's exit handler to make sure that the
XE driver is idle before starting the subtest.

Fixes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/294
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 lib/drmtest.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index f8810da43..8851029a7 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -64,6 +64,7 @@
 #include "intel_reg.h"
 #include "ioctl_wrappers.h"
 #include "igt_dummyload.h"
+#include "xe/xe_gt.h"
 #include "xe/xe_query.h"
 
 /**
@@ -663,12 +664,16 @@ static void __cancel_work_at_exit(int fd)
 {
 	igt_terminate_spins(); /* for older kernels */
 
-	igt_params_set(fd, "reset", "%u", -1u /* any method */);
-	igt_drop_caches_set(fd,
-			    /* cancel everything */
-			    DROP_RESET_ACTIVE | DROP_RESET_SEQNO |
-			    /* cleanup */
-			    DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
+	if (is_xe_device(fd)) {
+		xe_force_gt_reset_all(fd);
+	} else {
+		igt_params_set(fd, "reset", "%u", -1u /* any method */);
+		igt_drop_caches_set(fd,
+				    /* cancel everything */
+				    DROP_RESET_ACTIVE | DROP_RESET_SEQNO |
+				    /* cleanup */
+				    DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED);
+	}
 }
 
 static void cancel_work_at_exit(int sig)
@@ -716,11 +721,11 @@ int drm_open_driver(int chipset)
 	igt_skip_on_f(fd<0, "No known gpu found for chipset flags 0x%u (%s)\n",
 		      chipset, chipset_to_str(chipset));
 
-	/* For i915, at least, we ensure that the driver is idle before
+	/* For i915 & xe, at least, we ensure that the driver is idle before
 	 * starting a test and we install an exit handler to wait until
 	 * idle before quitting.
 	 */
-	if (is_i915_device(fd)) {
+	if (is_intel_device(fd)) {
 		if (__sync_fetch_and_add(&open_count, 1) == 0) {
 			__cancel_work_at_exit(fd);
 			at_exit_drm_fd = drm_reopen_driver(fd);
-- 
2.43.2


^ permalink raw reply related	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-07-25 23:15 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-24  7:05 [i-g-t 1/2] lib/drmtest: Ensure the XE driver is idle before starting a test Bhanuprakash Modem
2024-07-24  7:05 ` [i-g-t 2/2] HAX: Test rmfb tests in BAT Bhanuprakash Modem
2024-07-24  9:04 ` ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/drmtest: Ensure the XE driver is idle before starting a test Patchwork
2024-07-24  9:10 ` ✗ CI.xeBAT: failure " Patchwork
2024-07-24  9:13 ` [i-g-t 1/2] " Kamil Konieczny
2024-07-24 10:21 ` ✗ CI.xeFULL: failure for series starting with [i-g-t,1/2] " Patchwork
2024-07-24 11:18 ` ✗ Fi.CI.IGT: " Patchwork
2024-07-25  4:18 ` [i-g-t V2 1/2] " Bhanuprakash Modem
2024-07-25 13:45   ` Bernatowicz, Marcin
2024-07-25 16:35     ` Matthew Brost
2024-07-25 15:57   ` Kamil Konieczny
2024-07-25  6:23 ` ✗ Fi.CI.BAT: failure for series starting with [i-g-t,V2,1/2] lib/drmtest: Ensure the XE driver is idle before starting a test (rev2) Patchwork
2024-07-25  6:36 ` ✗ CI.xeBAT: " Patchwork
2024-07-25  8:51 ` ✗ CI.xeBAT: failure for series starting with [i-g-t,V2,1/2] lib/drmtest: Ensure the XE driver is idle before starting a test (rev3) Patchwork
2024-07-25  8:52 ` ✓ Fi.CI.BAT: success " Patchwork
2024-07-25  9:07 ` ✗ CI.xeFULL: failure for series starting with [i-g-t,V2,1/2] lib/drmtest: Ensure the XE driver is idle before starting a test (rev2) Patchwork
2024-07-25 12:04 ` ✗ CI.xeFULL: failure for series starting with [i-g-t,V2,1/2] lib/drmtest: Ensure the XE driver is idle before starting a test (rev3) Patchwork
2024-07-25 23:15 ` ✗ Fi.CI.IGT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox