From patchwork Wed Aug 8 08:49:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10559651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57C9F14C0 for ; Wed, 8 Aug 2018 08:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 471952A91C for ; Wed, 8 Aug 2018 08:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A24F2A921; Wed, 8 Aug 2018 08:49:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C7C692A91C for ; Wed, 8 Aug 2018 08:49:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A737C89F03; Wed, 8 Aug 2018 08:49:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 778FD89F03; Wed, 8 Aug 2018 08:49:40 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 12707767-1500050 for multiple; Wed, 08 Aug 2018 09:49:25 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 8 Aug 2018 09:49:24 +0100 Message-Id: <20180808084924.17826-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.18.0 Subject: [Intel-gfx] [PATCH i-g-t] igt/gem_eio: Apply reset-stress to each engine X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, Mika Kuoppala MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP A simple question as to whether the error only occurs on rcs/hsw, or all. Signed-off-by: Chris Wilson Cc: Mika Kuoppala Reviewed-by: Mika Kuoppala --- tests/gem_eio.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/gem_eio.c b/tests/gem_eio.c index 9d608e83e..45f9f9c2d 100644 --- a/tests/gem_eio.c +++ b/tests/gem_eio.c @@ -646,13 +646,10 @@ static void test_inflight_internal(int fd, unsigned int wait) close(fd); } -/* - * Verify that we can submit and execute work after unwedging the GPU. - */ -static void test_reset_stress(int fd, unsigned int flags) +static void reset_stress(int fd, + uint32_t ctx0, unsigned int engine, + unsigned int flags) { - uint32_t ctx0 = context_create_safe(fd); - igt_until_timeout(5) { struct drm_i915_gem_execbuffer2 execbuf = { }; struct drm_i915_gem_exec_object2 obj = { }; @@ -680,6 +677,7 @@ static void test_reset_stress(int fd, unsigned int flags) execbuf.buffers_ptr = to_user_pointer(&obj); execbuf.buffer_count = 1; execbuf.rsvd1 = ctx0; + execbuf.flags = engine; for (i = 0; i < 10; i++) gem_execbuf(fd, &execbuf); @@ -710,6 +708,18 @@ static void test_reset_stress(int fd, unsigned int flags) gem_context_destroy(fd, ctx); gem_close(fd, obj.handle); } +} + +/* + * Verify that we can submit and execute work after unwedging the GPU. + */ +static void test_reset_stress(int fd, unsigned int flags) +{ + uint32_t ctx0 = context_create_safe(fd); + unsigned int engine; + + for_each_engine(fd, engine) + reset_stress(fd, ctx0, engine, flags); gem_context_destroy(fd, ctx0); }