From patchwork Wed Feb 1 13:18:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kahola X-Patchwork-Id: 9549715 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 13ECD60424 for ; Wed, 1 Feb 2017 13:17:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0456B2842E for ; Wed, 1 Feb 2017 13:17:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED4CA28448; Wed, 1 Feb 2017 13:17:37 +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 7064A2842E for ; Wed, 1 Feb 2017 13:17:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B39166E7E1; Wed, 1 Feb 2017 13:17:36 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 386AC6E7DE for ; Wed, 1 Feb 2017 13:17:35 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 01 Feb 2017 05:17:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,320,1477983600"; d="scan'208";a="38245163" Received: from sorvi.fi.intel.com ([10.237.72.109]) by orsmga002.jf.intel.com with ESMTP; 01 Feb 2017 05:17:34 -0800 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Date: Wed, 1 Feb 2017 15:18:09 +0200 Message-Id: <1485955089-30267-8-git-send-email-mika.kahola@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485955089-30267-1-git-send-email-mika.kahola@intel.com> References: <1485955089-30267-1-git-send-email-mika.kahola@intel.com> Subject: [Intel-gfx] [PATCH i-g-t v3 7/7] tests/kms_cursor_legacy: Add TEST_ONLY flag 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 Add TEST_ONLY flag to test atomic modesetting commits without actual real-life commit. Signed-off-by: Mika Kahola --- tests/kms_cursor_legacy.c | 230 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 204 insertions(+), 26 deletions(-) diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c index c7083a0..97adf8c 100644 --- a/tests/kms_cursor_legacy.c +++ b/tests/kms_cursor_legacy.c @@ -1441,53 +1441,165 @@ igt_main igt_subtest("all-pipes-torture-move") stress(&display, -1, -ncpus, DRM_MODE_CURSOR_MOVE, 20); - igt_subtest("nonblocking-modeset-vs-cursor-atomic") + igt_subtest("nonblocking-modeset-vs-cursor-atomic") { + display.force_test_atomic = false; nonblocking_modeset_vs_cursor(&display, 1); + } + + igt_subtest("nonblocking-modeset-vs-cursor-atomic-with-test") { + display.force_test_atomic = true; + nonblocking_modeset_vs_cursor(&display, 1); + } - igt_subtest("long-nonblocking-modeset-vs-cursor-atomic") + igt_subtest("long-nonblocking-modeset-vs-cursor-atomic") { + display.force_test_atomic = false; nonblocking_modeset_vs_cursor(&display, 16); + } - igt_subtest("2x-flip-vs-cursor-legacy") + igt_subtest("long-nonblocking-modeset-vs-cursor-atomic-with-test") { + display.force_test_atomic = true; + nonblocking_modeset_vs_cursor(&display, 16); + } + + igt_subtest("2x-flip-vs-cursor-legacy") { + display.force_test_atomic = false; + two_screens_flip_vs_cursor(&display, 8, false, false); + } + + igt_subtest("2x-flip-vs-cursor-legacy-with-test") { + display.force_test_atomic = true; two_screens_flip_vs_cursor(&display, 8, false, false); + } + + igt_subtest("2x-flip-vs-cursor-atomic") { + display.force_test_atomic = false; + two_screens_flip_vs_cursor(&display, 4, false, true); + } - igt_subtest("2x-flip-vs-cursor-atomic") + igt_subtest("2x-flip-vs-cursor-atomic-with-test") { + display.force_test_atomic = true; two_screens_flip_vs_cursor(&display, 4, false, true); + } - igt_subtest("2x-cursor-vs-flip-legacy") + igt_subtest("2x-cursor-vs-flip-legacy") { + display.force_test_atomic = false; two_screens_cursor_vs_flip(&display, 8, false); + } + + igt_subtest("2x-cursor-vs-flip-legacy-with-test") { + display.force_test_atomic = true; + two_screens_cursor_vs_flip(&display, 8, false); + } - igt_subtest("2x-long-flip-vs-cursor-legacy") + igt_subtest("2x-long-flip-vs-cursor-legacy") { + display.force_test_atomic = false; two_screens_flip_vs_cursor(&display, 150, false, false); + } + + igt_subtest("2x-long-flip-vs-cursor-legacy-with-test") { + display.force_test_atomic = true; + two_screens_flip_vs_cursor(&display, 150, false, false); + } + + igt_subtest("2x-long-flip-vs-cursor-atomic") { + display.force_test_atomic = false; + two_screens_flip_vs_cursor(&display, 150, false, true); + } - igt_subtest("2x-long-flip-vs-cursor-atomic") + igt_subtest("2x-long-flip-vs-cursor-atomic-with-test") { + display.force_test_atomic = true; two_screens_flip_vs_cursor(&display, 150, false, true); + } - igt_subtest("2x-long-cursor-vs-flip-legacy") + igt_subtest("2x-long-cursor-vs-flip-legacy") { + display.force_test_atomic = false; two_screens_cursor_vs_flip(&display, 50, false); + } - igt_subtest("2x-nonblocking-modeset-vs-cursor-atomic") + igt_subtest("2x-long-cursor-vs-flip-legacy-with-test") { + display.force_test_atomic = true; + two_screens_cursor_vs_flip(&display, 50, false); + } + + igt_subtest("2x-nonblocking-modeset-vs-cursor-atomic") { + display.force_test_atomic = false; two_screens_flip_vs_cursor(&display, 8, true, true); + } + + igt_subtest("2x-nonblocking-modeset-vs-cursor-atomic-with-test") { + display.force_test_atomic = true; + two_screens_flip_vs_cursor(&display, 8, true, true); + } + + igt_subtest("2x-cursor-vs-flip-atomic") { + display.force_test_atomic = false; + two_screens_cursor_vs_flip(&display, 8, true); + } - igt_subtest("2x-cursor-vs-flip-atomic") + igt_subtest("2x-cursor-vs-flip-atomic-with-test") { + display.force_test_atomic = true; two_screens_cursor_vs_flip(&display, 8, true); + } - igt_subtest("2x-long-nonblocking-modeset-vs-cursor-atomic") + igt_subtest("2x-long-nonblocking-modeset-vs-cursor-atomic") { + display.force_test_atomic = false; two_screens_flip_vs_cursor(&display, 150, true, true); + } - igt_subtest("2x-long-cursor-vs-flip-atomic") + igt_subtest("2x-long-nonblocking-modeset-vs-cursor-atomic-with-test") { + display.force_test_atomic = true; + two_screens_flip_vs_cursor(&display, 150, true, true); + } + + igt_subtest("2x-long-cursor-vs-flip-atomic") { + display.force_test_atomic = false; two_screens_cursor_vs_flip(&display, 50, true); + } - igt_subtest("flip-vs-cursor-crc-legacy") + igt_subtest("2x-long-cursor-vs-flip-atomic-with-test") { + display.force_test_atomic = true; + two_screens_cursor_vs_flip(&display, 50, true); + } + + igt_subtest("flip-vs-cursor-crc-legacy") { + display.force_test_atomic = false; + flip_vs_cursor_crc(&display, false); + } + + igt_subtest("flip-vs-cursor-crc-legacy-with-test") { + display.force_test_atomic = true; flip_vs_cursor_crc(&display, false); + } - igt_subtest("flip-vs-cursor-crc-atomic") + igt_subtest("flip-vs-cursor-crc-atomic") { + display.force_test_atomic = false; flip_vs_cursor_crc(&display, true); + } + + igt_subtest("flip-vs-cursor-crc-atomic-with-test") { + display.force_test_atomic = true; + flip_vs_cursor_crc(&display, true); + } - igt_subtest("flip-vs-cursor-busy-crc-legacy") + igt_subtest("flip-vs-cursor-busy-crc-legacy") { + display.force_test_atomic = false; flip_vs_cursor_busy_crc(&display, false); + } - igt_subtest("flip-vs-cursor-busy-crc-atomic") + igt_subtest("flip-vs-cursor-busy-crc-legacy-with-test") { + display.force_test_atomic = true; + flip_vs_cursor_busy_crc(&display, false); + } + + igt_subtest("flip-vs-cursor-busy-crc-atomic") { + display.force_test_atomic = false; + flip_vs_cursor_busy_crc(&display, true); + } + + igt_subtest("flip-vs-cursor-busy-crc-atomic-with-test") { + display.force_test_atomic = true; flip_vs_cursor_busy_crc(&display, true); + } for (i = 0; i <= flip_test_last; i++) { const char *modes[flip_test_last+1] = { @@ -1509,33 +1621,99 @@ igt_main default: break; } - igt_subtest_f("%sflip-before-cursor-%s", prefix, modes[i]) + igt_subtest_f("%sflip-before-cursor-%s", prefix, modes[i]) { + display.force_test_atomic = false; + basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR, 0); + } + + igt_subtest_f("%sflip-before-cursor-%s-with-test", prefix, modes[i]) { + display.force_test_atomic = true; basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR, 0); + } - if (!cursor_slowpath(i)) - igt_subtest_f("%sbusy-flip-before-cursor-%s", prefix, modes[i]) + if (!cursor_slowpath(i)) { + igt_subtest_f("%sbusy-flip-before-cursor-%s", prefix, modes[i]) { + display.force_test_atomic = false; basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR, BASIC_BUSY); + } - igt_subtest_f("%sflip-after-cursor-%s", prefix, modes[i]) + igt_subtest_f("%sbusy-flip-before-cursor-%s-with-test", prefix, modes[i]) { + display.force_test_atomic = true; + basic_flip_cursor(&display, i, FLIP_BEFORE_CURSOR, + BASIC_BUSY); + } + } + + igt_subtest_f("%sflip-after-cursor-%s", prefix, modes[i]) { + display.force_test_atomic = false; + basic_flip_cursor(&display, i, FLIP_AFTER_CURSOR, 0); + } + + igt_subtest_f("%sflip-after-cursor-%s-with-test", prefix, modes[i]) { + display.force_test_atomic = true; basic_flip_cursor(&display, i, FLIP_AFTER_CURSOR, 0); + } - igt_subtest_f("flip-vs-cursor-%s", modes[i]) + igt_subtest_f("flip-vs-cursor-%s", modes[i]) { + display.force_test_atomic = false; flip_vs_cursor(&display, i, 150); - igt_subtest_f("cursor-vs-flip-%s", modes[i]) + } + + igt_subtest_f("flip-vs-cursor-%s-with-test", modes[i]) { + display.force_test_atomic = true; + flip_vs_cursor(&display, i, 150); + } + + igt_subtest_f("cursor-vs-flip-%s", modes[i]) { + display.force_test_atomic = false; cursor_vs_flip(&display, i, 50); + } - igt_subtest_f("cursorA-vs-flipA-%s", modes[i]) + igt_subtest_f("cursor-vs-flip-%s-with-test", modes[i]) { + display.force_test_atomic = true; + cursor_vs_flip(&display, i, 50); + } + + igt_subtest_f("cursorA-vs-flipA-%s", modes[i]) { + display.force_test_atomic = false; + flip(&display, 0, 0, 10, i); + } + + igt_subtest_f("cursorA-vs-flipA-%s-with-test", modes[i]) { + display.force_test_atomic = true; flip(&display, 0, 0, 10, i); + } - igt_subtest_f("cursorA-vs-flipB-%s", modes[i]) + igt_subtest_f("cursorA-vs-flipB-%s", modes[i]) { + display.force_test_atomic = false; flip(&display, 0, 1, 10, i); + } + + igt_subtest_f("cursorA-vs-flipB-%s-with-test", modes[i]) { + display.force_test_atomic = true; + flip(&display, 0, 1, 10, i); + } + + igt_subtest_f("cursorB-vs-flipA-%s", modes[i]) { + display.force_test_atomic = false; + flip(&display, 1, 0, 10, i); + } - igt_subtest_f("cursorB-vs-flipA-%s", modes[i]) + igt_subtest_f("cursorB-vs-flipA-%s-with-test", modes[i]) { + display.force_test_atomic = true; flip(&display, 1, 0, 10, i); + } + + igt_subtest_f("cursorB-vs-flipB-%s", modes[i]) { + display.force_test_atomic = false; + flip(&display, 1, 1, 10, i); + } - igt_subtest_f("cursorB-vs-flipB-%s", modes[i]) + igt_subtest_f("cursorB-vs-flipB-%s-with-test", modes[i]) { + display.force_test_atomic = true; flip(&display, 1, 1, 10, i); + } } igt_fixture {