[igt-dev] [PATCH i-g-t v2] tests/xe_spin_batch: Fix compilation failures

Nirmoy Das nirmoy.das at intel.com
Tue Dec 5 13:17:08 UTC 2023


Fix compilation failures with recent uAPI changes.

v2: add missing DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM
    flag(Matt).

Signed-off-by: Nirmoy Das <nirmoy.das at intel.com>
Acked-by: Matthew Auld <matthew.auld at intel.com>
---
 tests/intel/xe_spin_batch.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/intel/xe_spin_batch.c b/tests/intel/xe_spin_batch.c
index 87e1a86a2..e8dca7826 100644
--- a/tests/intel/xe_spin_batch.c
+++ b/tests/intel/xe_spin_batch.c
@@ -165,7 +165,7 @@ static void store_dword_batch(struct data *data, uint64_t addr, int value)
 static void preempter(int fd, struct drm_xe_engine_class_instance *hwe)
 {
 	struct drm_xe_sync sync = {
-		.flags = DRM_XE_SYNC_FLAG_SYNCOBJ | DRM_XE_SYNC_FLAG_SIGNAL
+		.flags = DRM_XE_SYNC_TYPE_SYNCOBJ | DRM_XE_SYNC_FLAG_SIGNAL
 	};
 	struct drm_xe_exec exec = {
 		.num_batch_buffer = 1,
@@ -195,8 +195,9 @@ static void preempter(int fd, struct drm_xe_engine_class_instance *hwe)
 	bo_size = ALIGN(bo_size + xe_cs_prefetch_size(fd),
 			xe_get_default_alignment(fd));
 
-	bo = xe_bo_create_flags(fd, vm, bo_size,
-				visible_vram_if_possible(fd, hwe->gt_id));
+	bo = xe_bo_create(fd, vm, bo_size,
+			  vram_if_possible(fd, hwe->gt_id),
+			  DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM);
 
 	xe_vm_bind_async(fd, vm, hwe->gt_id, bo, 0, addr, bo_size, &sync, 1);
 	data = xe_bo_map(fd, bo, bo_size);
@@ -267,7 +268,7 @@ static void xe_spin_fixed_duration(int fd, int gt, int class, int flags)
 	if (flags & SPIN_FIX_DURATION_PREEMPT)
 		ext = to_user_pointer(&ext_prio);
 
-	xe_for_each_hw_engine(fd, _hwe)
+	xe_for_each_engine(fd, _hwe)
 		if (_hwe->engine_class == class && _hwe->gt_id == gt)
 			hwe = _hwe;
 
@@ -348,7 +349,7 @@ igt_main
 
 	igt_subtest("spin-fixed-duration-with-preempter")
 		xe_for_each_gt(fd, gt)
-			xe_for_each_hw_engine_class(class)
+			xe_for_each_engine_class(class)
 				xe_spin_fixed_duration(fd, gt, class, SPIN_FIX_DURATION_PREEMPT);
 
 	igt_fixture
-- 
2.42.0



More information about the igt-dev mailing list