From patchwork Tue Oct 3 13:45:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9982875 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 8BA6560375 for ; Tue, 3 Oct 2017 13:45:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E86A283D8 for ; Tue, 3 Oct 2017 13:45:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73A81287BE; Tue, 3 Oct 2017 13:45:30 +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 36EF4283D8 for ; Tue, 3 Oct 2017 13:45:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C52A56E4D7; Tue, 3 Oct 2017 13:45:29 +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 DED216E4CF for ; Tue, 3 Oct 2017 13:45:27 +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 8992445-1500050 for multiple; Tue, 03 Oct 2017 14:45:21 +0100 Received: by haswell.alporthouse.com (sSMTP sendmail emulation); Tue, 03 Oct 2017 14:45:22 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 3 Oct 2017 14:45:16 +0100 Message-Id: <20171003134519.7668-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171003134519.7668-1-chris@chris-wilson.co.uk> References: <20171003134519.7668-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] [CI igt 2/5] igt/gem_workarounds: Also exercise fresh contexts not the persistent default 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 Signed-off-by: Chris Wilson --- tests/gem_workarounds.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/tests/gem_workarounds.c b/tests/gem_workarounds.c index 95ec250a..c252133f 100644 --- a/tests/gem_workarounds.c +++ b/tests/gem_workarounds.c @@ -164,8 +164,14 @@ static int workaround_fail_count(int fd) return fail_count; } -static void check_workarounds(int fd, enum operation op) +#define CONTEXT 0x1 +static void check_workarounds(int fd, enum operation op, unsigned int flags) { + uint32_t ctx = 0; + + if (flags & CONTEXT) + ctx = gem_context_create(fd); + igt_assert_eq(workaround_fail_count(fd), 0); switch (op) { @@ -178,13 +184,16 @@ static void check_workarounds(int fd, enum operation op) break; case SIMPLE_READ: - return; + break; default: igt_assert(0); } igt_assert_eq(workaround_fail_count(fd), 0); + + if (ctx) + gem_context_destroy(fd, ctx); } igt_main @@ -230,11 +239,20 @@ igt_main } igt_subtest("basic-read") - check_workarounds(device, SIMPLE_READ); + check_workarounds(device, SIMPLE_READ, 0); + + igt_subtest("basic-read-context") + check_workarounds(device, SIMPLE_READ, CONTEXT); igt_subtest("reset") - check_workarounds(device, GPU_RESET); + check_workarounds(device, GPU_RESET, 0); + + igt_subtest("reset-context") + check_workarounds(device, GPU_RESET, CONTEXT); igt_subtest("suspend-resume") - check_workarounds(device, SUSPEND_RESUME); + check_workarounds(device, SUSPEND_RESUME, 0); + + igt_subtest("suspend-resume-context") + check_workarounds(device, SUSPEND_RESUME, CONTEXT); }