[PATCH i-g-t 13/21] tests/xe_eudebug: Adapt vm-bind-clear* subtests to debug data

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

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

EU debug no longer relays events for VM_BIND_OP_[MAP|UNMAP] operations.
Instead it reports newly added 'VM_BIND_OP_DEBUG_DATA_[ADD|REMOVE]'
operations through the event interface. Convert the vm-bind-clear*
subtests by appending the newly added ops to each regular map/unmap
operation.

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

diff --git a/tests/intel/xe_eudebug.c b/tests/intel/xe_eudebug.c
index fed9a47405..3cd1f61f7b 100644
--- a/tests/intel/xe_eudebug.c
+++ b/tests/intel/xe_eudebug.c
@@ -2030,8 +2030,10 @@ static void *vm_bind_clear_thread(void *data)
 		clean_bo = xe_bo_create(c->fd, vm, bo_size, priv->region,
 					DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM);
 		memset(fence_data, 0, sizeof(*fence_data));
-		xe_eudebug_client_vm_bind_flags(c, vm, clean_bo, 0, clean_offset, bo_size,
-						0, &uf_sync, 1, 0);
+		xe_eudebug_client_vm_bind_map_with_debug_data(c, vm, clean_offset, bo_size,
+							      clean_bo, 0, NULL,
+							      DRM_XE_VM_BIND_DEBUG_DATA_PSEUDO_MODULE_AREA,
+							      0, &uf_sync, 1);
 		xe_wait_ufence(c->fd, fence_data, uf_sync.timeline_value, 0,
 			       XE_EUDEBUG_DEFAULT_TIMEOUT_SEC * NSEC_PER_SEC);
 
@@ -2039,8 +2041,10 @@ static void *vm_bind_clear_thread(void *data)
 		batch_bo = xe_bo_create(c->fd, vm, bo_size, priv->region,
 					DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM);
 		memset(fence_data, 0, sizeof(*fence_data));
-		xe_eudebug_client_vm_bind_flags(c, vm, batch_bo, 0, batch_offset, bo_size,
-						0, &uf_sync, 1, 0);
+		xe_eudebug_client_vm_bind_map_with_debug_data(c, vm, batch_offset, bo_size,
+							      batch_bo, 0, NULL,
+							      DRM_XE_VM_BIND_DEBUG_DATA_PSEUDO_MODULE_AREA,
+							      0, &uf_sync, 1);
 		xe_wait_ufence(c->fd, fence_data, uf_sync.timeline_value, 0,
 			       XE_EUDEBUG_DEFAULT_TIMEOUT_SEC * NSEC_PER_SEC);
 
@@ -2077,10 +2081,10 @@ static void *vm_bind_clear_thread(void *data)
 		xe_eudebug_client_exec_queue_destroy(c, &eq_create);
 		munmap(map, bo_size);
 
-		xe_eudebug_client_vm_unbind(c, vm, 0, batch_offset, bo_size);
+		xe_eudebug_client_vm_bind_unmap_with_debug_data(c, vm, batch_offset, bo_size);
 		gem_close(c->fd, batch_bo);
 
-		xe_eudebug_client_vm_unbind(c, vm, 0, clean_offset, bo_size);
+		xe_eudebug_client_vm_bind_unmap_with_debug_data(c, vm, clean_offset, bo_size);
 		gem_close(c->fd, clean_bo);
 
 		count++;
-- 
2.43.0