From patchwork Thu Aug 13 20:31:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 7010901 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 42F389F344 for ; Thu, 13 Aug 2015 20:54:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B09E2064D for ; Thu, 13 Aug 2015 20:54:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C74DC2067D for ; Thu, 13 Aug 2015 20:54:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D6F86E5C4; Thu, 13 Aug 2015 13:54:28 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from gproxy10-pub.mail.unifiedlayer.com (gproxy10-pub.mail.unifiedlayer.com [69.89.20.226]) by gabe.freedesktop.org (Postfix) with SMTP id 720846E5C4 for ; Thu, 13 Aug 2015 13:54:27 -0700 (PDT) Received: (qmail 19435 invoked by uid 0); 13 Aug 2015 20:54:27 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy10.mail.unifiedlayer.com with SMTP; 13 Aug 2015 20:54:27 -0000 Received: from box514.bluehost.com ([74.220.219.114]) by CMOut01 with id 4LuN1r02W2UhLwi01LuRsn; Thu, 13 Aug 2015 14:54:26 -0600 X-Authority-Analysis: v=2.1 cv=NJxGpSKg c=1 sm=1 tr=0 a=9W6Fsu4pMcyimqnCr1W0/w==:117 a=9W6Fsu4pMcyimqnCr1W0/w==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=TBVoxVdAAAAA:8 a=GhZ5P8ky69gA:10 a=noBwr2J6l1kA:10 a=uRRa74qj2VoA:10 a=qkdsE1BxNG9maHwuic8A:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=XpPz7ErUVLG8wn15aEKfztRIF/+j5GEfwefQhj5DsGM=; b=FZxehNxd/SpaWYp6MlkfUws8HkTZjItF2inXK1beLxnbX/nx85ngsegQcbbkxo20kBzkoQXDv9XThxkpw5lBl6+6CKU3G2r8UmKkbJHa8Rqnoze4KabqbU5c/Ys3fGZ8; Received: from [67.161.37.189] (port=44094 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.84) (envelope-from ) id 1ZPzAD-0004up-OB for intel-gfx@lists.freedesktop.org; Thu, 13 Aug 2015 14:31:49 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 13 Aug 2015 13:31:39 -0700 Message-Id: <1439497901-14310-16-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439497901-14310-1-git-send-email-jbarnes@virtuousgeek.org> References: <1439497901-14310-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 16/18] tests/kms_flip: add basic tests for flip, flip vs dpms, and flip modeset 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simple variants that don't do multiple output or interruptible testing. Signed-off-by: Jesse Barnes --- tests/kms_flip.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/kms_flip.c b/tests/kms_flip.c index a595d9f..a0e4112 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -80,6 +80,7 @@ #define TEST_TS_CONT (1 << 27) #define TEST_BO_TOOBIG (1 << 28) #define TEST_HANG_ONCE (1 << 29) +#define TEST_BASIC (1 << 30) #define EVENT_FLIP (1 << 0) #define EVENT_VBLANK (1 << 1) @@ -1649,7 +1650,7 @@ int main(int argc, char **argv) "blt-wf_vblank-vs-modeset" }, { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS, "rcs-wf_vblank-vs-modeset" }, - + { 30, TEST_FLIP | TEST_BASIC, "basic-plain-flip" }, { 30, TEST_FLIP , "plain-flip" }, { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" }, @@ -1657,12 +1658,14 @@ int main(int argc, char **argv) { 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE, "plain-flip-fb-recreate" }, { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, + { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "basic-flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL, "flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" }, { 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" }, { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" }, { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" }, + { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "basic-flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL, "flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" }, @@ -1721,6 +1724,9 @@ int main(int argc, char **argv) igt_subtest(tests[i].name) run_test(tests[i].duration, tests[i].flags); + if (tests[i].flags & TEST_BASIC) + continue; + if (tests[i].flags & TEST_NO_2X_OUTPUT) continue; @@ -1740,6 +1746,9 @@ int main(int argc, char **argv) !(tests[i].flags & TEST_VBLANK_ABSOLUTE)) continue; + if (tests[i].flags & TEST_BASIC) + continue; + igt_subtest_f( "%s-interruptible", tests[i].name) run_test(tests[i].duration, tests[i].flags);