From patchwork Fri Sep 29 15:26:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9978285 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 93C536037F for ; Fri, 29 Sep 2017 15:27:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8463529879 for ; Fri, 29 Sep 2017 15:27:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7961729884; Fri, 29 Sep 2017 15:27:06 +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=-4.2 required=2.0 tests=BAYES_00, 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 3A7D52987F for ; Fri, 29 Sep 2017 15:27:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CCAF76EBC6; Fri, 29 Sep 2017 15:27:05 +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 CA6216EBB8 for ; Fri, 29 Sep 2017 15:26:59 +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 8936548-1500050 for multiple; Fri, 29 Sep 2017 16:26:53 +0100 Received: by haswell.alporthouse.com (sSMTP sendmail emulation); Fri, 29 Sep 2017 16:26:52 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 29 Sep 2017 16:26:39 +0100 Message-Id: <20170929152642.24764-4-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20170929152642.24764-1-chris@chris-wilson.co.uk> References: <20170929152642.24764-1-chris@chris-wilson.co.uk> X-Originating-IP: 78.156.65.138 X-Country: code=GB country="United Kingdom" ip=78.156.65.138 Subject: [Intel-gfx] [PATCH igt 4/7] igt/gem_workarounds: Also test new fd (implicit default context) X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP To complete the picture also test a new fd with its implicit default context. Now we have a test for a longstanding fd, new client, new context. Signed-off-by: Chris Wilson --- tests/gem_workarounds.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/gem_workarounds.c b/tests/gem_workarounds.c index 62c10877..2a328959 100644 --- a/tests/gem_workarounds.c +++ b/tests/gem_workarounds.c @@ -166,11 +166,25 @@ static int workaround_fail_count(int fd) return fail_count; } +static int reopen(int fd) +{ + char path[256]; + + snprintf(path, sizeof(path), "/proc/self/fd/%d", fd); + fd = open(path, O_RDWR); + igt_assert_lte(0, fd); + + return fd; +} + #define CONTEXT 0x1 +#define FDS 0x2 static void check_workarounds(int fd, enum operation op, unsigned int flags) { uint32_t ctx = 0; + if (flags & FDS) + fd = reopen(fd); if (flags & CONTEXT) ctx = gem_context_create(fd); @@ -196,6 +210,8 @@ static void check_workarounds(int fd, enum operation op, unsigned int flags) if (ctx) gem_context_destroy(fd, ctx); + if (flags & FDS) + close(fd); } igt_main @@ -246,15 +262,24 @@ igt_main igt_subtest("basic-read-context") check_workarounds(device, SIMPLE_READ, CONTEXT); + igt_subtest("basic-read-fd") + check_workarounds(device, SIMPLE_READ, FDS); + igt_subtest("reset") check_workarounds(device, GPU_RESET, 0); igt_subtest("reset-context") check_workarounds(device, GPU_RESET, CONTEXT); + igt_subtest("reset-fd") + check_workarounds(device, GPU_RESET, FDS); + igt_subtest("suspend-resume") check_workarounds(device, SUSPEND_RESUME, 0); igt_subtest("suspend-resume-context") check_workarounds(device, SUSPEND_RESUME, CONTEXT); + + igt_subtest("suspend-resume-fd") + check_workarounds(device, SUSPEND_RESUME, FDS); }