[PATCH i-g-t 07/21] tests/xe_eudebug: Adapt basic-read-event

[Mika Kuoppala <mika.kuoppala@linux.intel.com>]

From: Christoph Manszewski <christoph.manszewski@intel.com>

Adapt basic-read-event test to rely on vm create/destroy events for
positive test path since client create/destroy events are no longer
present.

Also update the assert for blocking event_read ioctl with no events
to expect -ETIMEDOUT

Signed-off-by: Christoph Manszewski <christoph.manszewski@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 tests/intel/xe_eudebug.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/tests/intel/xe_eudebug.c b/tests/intel/xe_eudebug.c
index 8d673b68bb..3c7a13f6fe 100644
--- a/tests/intel/xe_eudebug.c
+++ b/tests/intel/xe_eudebug.c
@@ -55,15 +55,16 @@ static void test_sysfs_toggle(int fd)
 #define STAGE_PRE_DEBUG_RESOURCES_DONE	1
 #define STAGE_DISCOVERY_DONE		2
 
-#define CREATE_VMS			(1 << 0)
-#define CREATE_EXEC_QUEUES		(1 << 1)
-#define VM_BIND				(1 << 2)
-#define VM_BIND_VM_DESTROY		(1 << 3)
-#define VM_BIND_EXTENDED		(1 << 4)
-#define VM_BIND_OP_MAP_USERPTR		(1 << 5)
-#define VM_BIND_DELAY_UFENCE_ACK	(1 << 6)
-#define VM_BIND_UFENCE_RECONNECT	(1 << 7)
-#define VM_BIND_UFENCE_SIGINT_CLIENT	(1 << 8)
+#define CREATE_VM			(1 << 0)
+#define CREATE_VMS			(1 << 1)
+#define CREATE_EXEC_QUEUES		(1 << 2)
+#define VM_BIND				(1 << 3)
+#define VM_BIND_VM_DESTROY		(1 << 4)
+#define VM_BIND_EXTENDED		(1 << 5)
+#define VM_BIND_OP_MAP_USERPTR		(1 << 6)
+#define VM_BIND_DELAY_UFENCE_ACK	(1 << 7)
+#define VM_BIND_UFENCE_RECONNECT	(1 << 8)
+#define VM_BIND_UFENCE_SIGINT_CLIENT	(1 << 9)
 #define TEST_FAULTABLE			(1 << 30)
 #define TEST_DISCOVERY			(1 << 31)
 
@@ -379,6 +380,11 @@ static void run_basic_client(struct xe_eudebug_client *c)
 {
 	int i;
 
+	if (c->flags & CREATE_VM) {
+		int vm = xe_eudebug_client_vm_create(c, DRM_XE_VM_CREATE_FLAG_LR_MODE, 0);
+		xe_eudebug_client_vm_destroy(c, vm);
+	}
+
 	if (c->flags & CREATE_VMS) {
 		const uint32_t flags[] = {
 			DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE | DRM_XE_VM_CREATE_FLAG_LR_MODE,
@@ -775,7 +781,7 @@ static void test_read_event(int fd)
 	event = calloc(1, MAX_EVENT_SIZE);
 	igt_assert(event);
 
-	c = xe_eudebug_client_create(fd, run_basic_client, 0, NULL);
+	c = xe_eudebug_client_create(fd, run_basic_client, CREATE_VM, NULL);
 	d = xe_eudebug_debugger_create(fd, 0, NULL);
 
 	igt_assert_eq(xe_eudebug_debugger_attach(d, c), 0);
@@ -784,14 +790,15 @@ static void test_read_event(int fd)
 	/* Negative read event - no events to read */
 	event->len = MAX_EVENT_SIZE;
 	event->type = DRM_XE_EUDEBUG_EVENT_READ;
-	igt_assert_eq(read_event(d->fd, event), -ENOENT);
+	igt_assert_eq(read_event(d->fd, event), -ETIMEDOUT);
 
 	xe_eudebug_client_start(c);
 
-	/* Positive read event - client create */
+	/* Positive read event - vm create */
 	igt_assert_eq(poll_event(d->fd, 500), 1);
 	event->type = DRM_XE_EUDEBUG_EVENT_READ;
 	igt_assert_eq(read_event(d->fd, event), 0);
+	igt_assert_eq(event->type, DRM_XE_EUDEBUG_EVENT_VM);
 	igt_assert_eq(event->flags, DRM_XE_EUDEBUG_EVENT_CREATE);
 
 	igt_assert_eq(poll_event(d->fd, 500), 1);
@@ -826,8 +833,9 @@ static void test_read_event(int fd)
 	/* event->len should now contain exact len */
 	igt_assert_lt(sizeof(*event), event->len);
 
-	/* Positive read event - client destroy */
+	/* Positive read event - vm destroy */
 	igt_assert_eq(read_event(d->fd, event), 0);
+	igt_assert_eq(event->type, DRM_XE_EUDEBUG_EVENT_VM);
 	igt_assert_eq(event->flags, DRM_XE_EUDEBUG_EVENT_DESTROY);
 
 	fcntl(d->fd, F_SETFL, fcntl(d->fd, F_GETFL) | O_NONBLOCK);
-- 
2.43.0