From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by gabe.freedesktop.org (Postfix) with ESMTPS id 346136EB7D for ; Tue, 8 Jun 2021 09:40:30 +0000 (UTC) Received: by mail-wm1-x335.google.com with SMTP id k5-20020a05600c1c85b02901affeec3ef8so1511538wms.0 for ; Tue, 08 Jun 2021 02:40:30 -0700 (PDT) From: Daniel Vetter Date: Tue, 8 Jun 2021 11:40:16 +0200 Message-Id: <20210608094020.21598-3-daniel.vetter@ffwll.ch> In-Reply-To: <20210608094020.21598-1-daniel.vetter@ffwll.ch> References: <20210608094020.21598-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 3/7] Revert "i915/gem_exec_reloc: Verify engine isolation" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: IGT development Cc: Daniel Vetter , Dave Airlie List-ID: This reverts commit 9fe244cb751c9d3be0581a943bb9baa8651d8d29. This validates gpu relocations, which we're about to delete. Cc: Jason Ekstrand Cc: Maarten Lankhorst Cc: Dave Airlie Signed-off-by: Daniel Vetter --- tests/i915/gem_exec_reloc.c | 73 ------------------------------------- 1 file changed, 73 deletions(-) diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c index efe6e2e02c52..3b200f557b2c 100644 --- a/tests/i915/gem_exec_reloc.c +++ b/tests/i915/gem_exec_reloc.c @@ -471,72 +471,6 @@ static void active_spin(int fd, unsigned engine) igt_spin_free(fd, spin); } -static void others_spin(int i915, unsigned engine) -{ - struct drm_i915_gem_relocation_entry reloc = {}; - struct drm_i915_gem_exec_object2 obj = { - .relocs_ptr = to_user_pointer(&reloc), - .relocation_count = 1, - }; - struct drm_i915_gem_execbuffer2 execbuf = { - .buffers_ptr = to_user_pointer(&obj), - .buffer_count = 1, - .flags = engine, - }; - const struct intel_execution_engine2 *e; - igt_spin_t *spin = NULL; - uint64_t addr; - int fence; - - __for_each_physical_engine(i915, e) { - if (e->flags == engine) - continue; - - if (!spin) { - spin = igt_spin_new(i915, - .engine = e->flags, - .flags = IGT_SPIN_FENCE_OUT); - fence = dup(spin->out_fence); - } else { - int old_fence; - - spin->execbuf.flags &= ~I915_EXEC_RING_MASK; - spin->execbuf.flags |= e->flags; - gem_execbuf_wr(i915, &spin->execbuf); - - old_fence = fence; - fence = sync_fence_merge(old_fence, - spin->execbuf.rsvd2 >> 32); - close(spin->execbuf.rsvd2 >> 32); - close(old_fence); - } - } - igt_require(spin); - - /* All other engines are busy, let's relocate! */ - obj.handle = batch_create(i915); - reloc.target_handle = obj.handle; - reloc.presumed_offset = -1; - reloc.offset = 64; - gem_execbuf(i915, &execbuf); - - /* Verify the relocation took place */ - gem_read(i915, obj.handle, 64, &addr, sizeof(addr)); - igt_assert_eq_u64(addr, obj.offset); - gem_close(i915, obj.handle); - - /* Even if the spinner was harmed in the process */ - igt_spin_end(spin); - igt_assert_eq(sync_fence_wait(fence, 200), 0); - igt_assert_neq(sync_fence_status(fence), 0); - if (sync_fence_status(fence) < 0) - igt_warn("Spinner was cancelled, %s\n", - strerror(-sync_fence_status(fence))); - close(fence); - - igt_spin_free(i915, spin); -} - static bool has_64b_reloc(int fd) { return intel_gen(intel_get_drm_devid(fd)) >= 8; @@ -1329,13 +1263,6 @@ igt_main } } - igt_subtest_with_dynamic("basic-spin-others") { - __for_each_physical_engine(fd, e) { - igt_dynamic_f("%s", e->name) - others_spin(fd, e->flags); - } - } - igt_subtest_with_dynamic("basic-many-active") { __for_each_physical_engine(fd, e) { igt_dynamic_f("%s", e->name) -- 2.24.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev