With intel_measure_ring_size added as common function we can use it instead of the local copy
Signed-off-by: Daniele Ceraolo Spurio <[email protected]> Cc: Chris Wilson <[email protected]> --- tests/gem_ringfill.c | 96 +--------------------------------------------------- 1 file changed, 1 insertion(+), 95 deletions(-) diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c index 01cbd0a..8247e89 100644 --- a/tests/gem_ringfill.c +++ b/tests/gem_ringfill.c @@ -236,100 +236,6 @@ static void run_test(int fd, unsigned ring, unsigned flags, unsigned timeout) run_test(fd, ring, 0, 0); } -struct cork { - int device; - uint32_t handle; - uint32_t fence; -}; - -static void plug(int fd, struct cork *c) -{ - struct vgem_bo bo; - int dmabuf; - - c->device = drm_open_driver(DRIVER_VGEM); - - bo.width = bo.height = 1; - bo.bpp = 4; - vgem_create(c->device, &bo); - c->fence = vgem_fence_attach(c->device, &bo, VGEM_FENCE_WRITE); - - dmabuf = prime_handle_to_fd(c->device, bo.handle); - c->handle = prime_fd_to_handle(fd, dmabuf); - close(dmabuf); -} - -static void unplug(struct cork *c) -{ - vgem_fence_signal(c->device, c->fence); - close(c->device); -} - -static void alarm_handler(int sig) -{ -} - -static int __execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - return ioctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf); -} - -static unsigned int measure_ring_size(int fd) -{ - struct sigaction sa = { .sa_handler = alarm_handler }; - struct drm_i915_gem_exec_object2 obj[2]; - struct drm_i915_gem_execbuffer2 execbuf; - const uint32_t bbe = MI_BATCH_BUFFER_END; - unsigned int count, last; - struct itimerval itv; - struct cork c; - - memset(obj, 0, sizeof(obj)); - obj[1].handle = gem_create(fd, 4096); - gem_write(fd, obj[1].handle, 0, &bbe, sizeof(bbe)); - - memset(&execbuf, 0, sizeof(execbuf)); - execbuf.buffers_ptr = to_user_pointer(obj + 1); - execbuf.buffer_count = 1; - gem_execbuf(fd, &execbuf); - gem_sync(fd, obj[1].handle); - - plug(fd, &c); - obj[0].handle = c.handle; - - execbuf.buffers_ptr = to_user_pointer(obj); - execbuf.buffer_count = 2; - - sigaction(SIGALRM, &sa, NULL); - itv.it_interval.tv_sec = 0; - itv.it_interval.tv_usec = 100; - itv.it_value.tv_sec = 0; - itv.it_value.tv_usec = 1000; - setitimer(ITIMER_REAL, &itv, NULL); - - last = -1; - count = 0; - do { - if (__execbuf(fd, &execbuf) == 0) { - count++; - continue; - } - - if (last == count) - break; - - last = count; - } while (1); - - memset(&itv, 0, sizeof(itv)); - setitimer(ITIMER_REAL, &itv, NULL); - - unplug(&c); - gem_close(fd, obj[1].handle); - - return count; -} - igt_main { const struct { @@ -364,7 +270,7 @@ igt_main master = true; } - ring_size = measure_ring_size(fd); + ring_size = intel_measure_ring_size(fd, 0, false); igt_info("Ring size: %d batches\n", ring_size); igt_require(ring_size); } -- 1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
