From a765aa108105804c19096554447ad0cb71f64fc3 Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Wed, 17 Apr 2019 18:28:33 +0300 Subject: lib/igt_dummyload: Get rid of 'batch' on spinner accessors There is no guarantee that spinners are and will be implemented using batches. As we have igt_spin_t, manipulate it through igt_spin_* functions consistently and hide the batch nature. Cc: Chris Wilson Signed-off-by: Mika Kuoppala Reviewed-by: Chris Wilson --- tests/i915/gem_busy.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'tests/i915/gem_busy.c') diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c index ad853468..c120faf1 100644 --- a/tests/i915/gem_busy.c +++ b/tests/i915/gem_busy.c @@ -128,9 +128,9 @@ static void semaphore(int fd, unsigned ring, uint32_t flags) /* Create a long running batch which we can use to hog the GPU */ handle[BUSY] = gem_create(fd, 4096); - spin = igt_spin_batch_new(fd, - .engine = ring, - .dependency = handle[BUSY]); + spin = igt_spin_new(fd, + .engine = ring, + .dependency = handle[BUSY]); /* Queue a batch after the busy, it should block and remain "busy" */ igt_assert(exec_noop(fd, handle, ring | flags, false)); @@ -159,7 +159,7 @@ static void semaphore(int fd, unsigned ring, uint32_t flags) /* Check that our long batch was long enough */ igt_assert(still_busy(fd, handle[BUSY])); - igt_spin_batch_free(fd, spin); + igt_spin_free(fd, spin); /* And make sure it becomes idle again */ gem_sync(fd, handle[TEST]); @@ -379,16 +379,16 @@ static void close_race(int fd) igt_assert(sched_setscheduler(getpid(), SCHED_RR, &rt) == 0); for (i = 0; i < nhandles; i++) { - spin[i] = __igt_spin_batch_new(fd, - .engine = engines[rand() % nengine]); + spin[i] = __igt_spin_new(fd, + .engine = engines[rand() % nengine]); handles[i] = spin[i]->handle; } igt_until_timeout(20) { for (i = 0; i < nhandles; i++) { - igt_spin_batch_free(fd, spin[i]); - spin[i] = __igt_spin_batch_new(fd, - .engine = engines[rand() % nengine]); + igt_spin_free(fd, spin[i]); + spin[i] = __igt_spin_new(fd, + .engine = engines[rand() % nengine]); handles[i] = spin[i]->handle; __sync_synchronize(); } @@ -398,7 +398,7 @@ static void close_race(int fd) __sync_synchronize(); for (i = 0; i < nhandles; i++) - igt_spin_batch_free(fd, spin[i]); + igt_spin_free(fd, spin[i]); } igt_waitchildren(); @@ -430,11 +430,11 @@ static bool has_semaphores(int fd) static bool has_extended_busy_ioctl(int fd) { - igt_spin_t *spin = igt_spin_batch_new(fd, .engine = I915_EXEC_RENDER); + igt_spin_t *spin = igt_spin_new(fd, .engine = I915_EXEC_RENDER); uint32_t read, write; __gem_busy(fd, spin->handle, &read, &write); - igt_spin_batch_free(fd, spin); + igt_spin_free(fd, spin); return read != 0; } @@ -442,9 +442,9 @@ static bool has_extended_busy_ioctl(int fd) static void basic(int fd, unsigned ring, unsigned flags) { igt_spin_t *spin = - igt_spin_batch_new(fd, - .engine = ring, - .flags = IGT_SPIN_NO_PREEMPTION); + igt_spin_new(fd, + .engine = ring, + .flags = IGT_SPIN_NO_PREEMPTION); struct timespec tv; int timeout; bool busy; @@ -453,7 +453,7 @@ static void basic(int fd, unsigned ring, unsigned flags) timeout = 120; if ((flags & HANG) == 0) { - igt_spin_batch_end(spin); + igt_spin_end(spin); timeout = 1; } @@ -470,7 +470,7 @@ static void basic(int fd, unsigned ring, unsigned flags) } } - igt_spin_batch_free(fd, spin); + igt_spin_free(fd, spin); } igt_main -- cgit v1.2.3