From patchwork Thu Jan 19 16:35:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9526337 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 2249C60113 for ; Thu, 19 Jan 2017 16:35:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14B4F2851F for ; Thu, 19 Jan 2017 16:35:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 099EF285B8; Thu, 19 Jan 2017 16:35:48 +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, UNPARSEABLE_RELAY 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 C688A2851F for ; Thu, 19 Jan 2017 16:35:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5977A6EA88; Thu, 19 Jan 2017 16:35:47 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C4756EA80 for ; Thu, 19 Jan 2017 16:35:43 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id E754D2682B1 From: Robert Foss To: intel-gfx@lists.freedesktop.org, Tomeu Vizoso , Gustavo Padovan Date: Thu, 19 Jan 2017 11:35:05 -0500 Message-Id: <20170119163506.13270-6-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119163506.13270-1-robert.foss@collabora.com> References: <20170119163506.13270-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v1 5/6] tests/kms_cursor_legacy: Switch to using for_each_pipe construct 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 Avoid using hand-rolled construct for iterating over all pipes. Signed-off-by: Robert Foss --- tests/kms_cursor_legacy.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c index 5e9f5f39..156bd0c7 100644 --- a/tests/kms_cursor_legacy.c +++ b/tests/kms_cursor_legacy.c @@ -1360,6 +1360,7 @@ igt_main { const int ncpus = sysconf(_SC_NPROCESSORS_ONLN); igt_display_t display = { .drm_fd = -1 }; + enum pipe pipe; int i; igt_skip_on_simulation(); @@ -1373,27 +1374,23 @@ igt_main } igt_subtest_group { - for (int n = 0; n < I915_MAX_PIPES; n++) { + for_each_pipe(&display, pipe) { errno = 0; - igt_fixture { - igt_skip_on(n >= display.n_pipes); - } - - igt_subtest_f("pipe-%s-single-bo", kmstest_pipe_name(n)) - stress(&display, n, 1, DRM_MODE_CURSOR_BO, 20); - igt_subtest_f("pipe-%s-single-move", kmstest_pipe_name(n)) - stress(&display, n, 1, DRM_MODE_CURSOR_MOVE, 20); + igt_subtest_f("pipe-%s-single-bo", kmstest_pipe_name(pipe)) + stress(&display, pipe, 1, DRM_MODE_CURSOR_BO, 20); + igt_subtest_f("pipe-%s-single-move", kmstest_pipe_name(pipe)) + stress(&display, pipe, 1, DRM_MODE_CURSOR_MOVE, 20); - igt_subtest_f("pipe-%s-forked-bo", kmstest_pipe_name(n)) - stress(&display, n, ncpus, DRM_MODE_CURSOR_BO, 20); - igt_subtest_f("pipe-%s-forked-move", kmstest_pipe_name(n)) - stress(&display, n, ncpus, DRM_MODE_CURSOR_MOVE, 20); + igt_subtest_f("pipe-%s-forked-bo", kmstest_pipe_name(pipe)) + stress(&display, pipe, ncpus, DRM_MODE_CURSOR_BO, 20); + igt_subtest_f("pipe-%s-forked-move", kmstest_pipe_name(pipe)) + stress(&display, pipe, ncpus, DRM_MODE_CURSOR_MOVE, 20); - igt_subtest_f("pipe-%s-torture-bo", kmstest_pipe_name(n)) - stress(&display, n, -ncpus, DRM_MODE_CURSOR_BO, 20); - igt_subtest_f("pipe-%s-torture-move", kmstest_pipe_name(n)) - stress(&display, n, -ncpus, DRM_MODE_CURSOR_MOVE, 20); + igt_subtest_f("pipe-%s-torture-bo", kmstest_pipe_name(pipe)) + stress(&display, pipe, -ncpus, DRM_MODE_CURSOR_BO, 20); + igt_subtest_f("pipe-%s-torture-move", kmstest_pipe_name(pipe)) + stress(&display, pipe, -ncpus, DRM_MODE_CURSOR_MOVE, 20); } }