From 103af7286e2d1014e3d7126691fe046ab2c9f73e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 26 Sep 2017 09:59:10 +0100 Subject: lib: Ask the kernel to quiesce the GPU Since the introduction of debugfs/i915_drop_caches, we have offered the ability to wait upon all outstanding batches. This is more efficient and less error prone (one example is the use of context priorities, we have to idle at the lowest in order not to jump over any low priority tasks we want to wait upon) than trying to do it all in userspace. Though we could if we wanted to, it's just easier to use the existing facility designed for the purpose -- that we were already partially using! Note that debugfs/i915_drop_caches has only existed since v4.2. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen Reviewed-by: Petri Latvala --- lib/drmtest.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'lib/drmtest.c') diff --git a/lib/drmtest.c b/lib/drmtest.c index b2d8150f..fd11f5f5 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -161,35 +161,10 @@ static bool has_known_intel_chipset(int fd) */ void gem_quiescent_gpu(int fd) { - uint32_t bbe = MI_BATCH_BUFFER_END; - struct drm_i915_gem_execbuffer2 execbuf; - struct drm_i915_gem_exec_object2 obj; - unsigned ring; - igt_terminate_spin_batches(); - memset(&obj, 0, sizeof(obj)); - obj.handle = gem_create(fd, 4096); - gem_write(fd, obj.handle, 0, &bbe, sizeof(&bbe)); - - memset(&execbuf, 0, sizeof(execbuf)); - execbuf.buffers_ptr = to_user_pointer(&obj); - execbuf.buffer_count = 1; - - for (ring = 0; ring < 1<<6; ring++) { - execbuf.flags = ring; - __gem_execbuf(fd, &execbuf); - } - - if (gem_has_bsd2(fd)) { - execbuf.flags = I915_EXEC_BSD | (2 << 13); - __gem_execbuf(fd, &execbuf); - } - - gem_sync(fd, obj.handle); - gem_close(fd, obj.handle); - - igt_drop_caches_set(fd, DROP_RETIRE | DROP_IDLE | DROP_FREED); + igt_drop_caches_set(fd, + DROP_ACTIVE | DROP_RETIRE | DROP_IDLE | DROP_FREED); } /** -- cgit v1.2.3