From patchwork Mon Jan 30 14:12:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9545439 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 1DFB960417 for ; Mon, 30 Jan 2017 14:13:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2A6D27F07 for ; Mon, 30 Jan 2017 14:13:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E77BB2811E; Mon, 30 Jan 2017 14:13:45 +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 91B7A27F07 for ; Mon, 30 Jan 2017 14:13:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D9D56E514; Mon, 30 Jan 2017 14:13:23 +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 [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7544A6E4E3 for ; Mon, 30 Jan 2017 14:12:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 784B026A0AE From: Robert Foss To: intel-gfx@lists.freedesktop.org, Tomeu Vizoso , Maarten Lankhorst , Gustavo Padovan , Daniel Stone , Mika Kahola , Petri Latvala Date: Mon, 30 Jan 2017 09:12:10 -0500 Message-Id: <20170130141224.25063-20-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0.453.g787f75f05 In-Reply-To: <20170130141224.25063-1-robert.foss@collabora.com> References: <20170130141224.25063-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v3 19/33] tests/kms_plane: Add support for dynamic number of planes 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 changes reflecting the new support for dynamic number of planes per pipe. Signed-off-by: Robert Foss Reviewed-by: Mika Kahola --- tests/kms_plane.c | 96 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/tests/kms_plane.c b/tests/kms_plane.c index e843a170..d0de0f52 100644 --- a/tests/kms_plane.c +++ b/tests/kms_plane.c @@ -150,7 +150,7 @@ enum { static void test_plane_position_with_output(data_t *data, enum pipe pipe, - enum igt_plane plane, + int plane, igt_output_t *output, unsigned int flags) { @@ -170,7 +170,7 @@ test_plane_position_with_output(data_t *data, igt_output_set_pipe(output, pipe); mode = igt_output_get_mode(output); - primary = igt_output_get_plane(output, 0); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); sprite = igt_output_get_plane(output, plane); create_fb_for_mode__position(data, mode, 100, 100, 64, 64, @@ -222,7 +222,7 @@ test_plane_position_with_output(data_t *data, } static void -test_plane_position(data_t *data, enum pipe pipe, enum igt_plane plane, +test_plane_position(data_t *data, enum pipe pipe, int plane, unsigned int flags) { igt_output_t *output; @@ -294,7 +294,7 @@ enum { static void test_plane_panning_with_output(data_t *data, enum pipe pipe, - enum igt_plane plane, + int plane, igt_output_t *output, unsigned int flags) { @@ -348,8 +348,8 @@ test_plane_panning_with_output(data_t *data, } static void -test_plane_panning(data_t *data, enum pipe pipe, enum igt_plane plane, - unsigned int flags) +test_plane_panning(data_t *data, enum pipe pipe, int plane, + unsigned int flags) { igt_output_t *output; int connected_outs = 0; @@ -367,47 +367,57 @@ test_plane_panning(data_t *data, enum pipe pipe, enum igt_plane plane, } static void -run_tests_for_pipe_plane(data_t *data, enum pipe pipe, enum igt_plane plane) +run_tests_for_pipe_plane(data_t *data, enum pipe pipe) { - igt_subtest_f("plane-position-covered-pipe-%s-plane-%d", - kmstest_pipe_name(pipe), plane) - test_plane_position(data, pipe, plane, - TEST_POSITION_FULLY_COVERED); - - igt_subtest_f("plane-position-hole-pipe-%s-plane-%d", - kmstest_pipe_name(pipe), plane) - test_plane_position(data, pipe, plane, 0); - - igt_subtest_f("plane-position-hole-dpms-pipe-%s-plane-%d", - kmstest_pipe_name(pipe), plane) - test_plane_position(data, pipe, plane, - TEST_DPMS); - - igt_subtest_f("plane-panning-top-left-pipe-%s-plane-%d", - kmstest_pipe_name(pipe), plane) - test_plane_panning(data, pipe, plane, TEST_PANNING_TOP_LEFT); - - igt_subtest_f("plane-panning-bottom-right-pipe-%s-plane-%d", - kmstest_pipe_name(pipe), plane) - test_plane_panning(data, pipe, plane, - TEST_PANNING_BOTTOM_RIGHT); - - igt_subtest_f("plane-panning-bottom-right-suspend-pipe-%s-plane-%d", - kmstest_pipe_name(pipe), plane) - test_plane_panning(data, pipe, plane, - TEST_PANNING_BOTTOM_RIGHT | - TEST_SUSPEND_RESUME); -} + igt_subtest_f("plane-position-covered-pipe-%s-planes", + kmstest_pipe_name(pipe)) { + int n_planes = data->display.pipes[pipe].n_planes; + for (int plane = 1; plane < n_planes; plane++) + test_plane_position(data, pipe, plane, + TEST_POSITION_FULLY_COVERED); + } -static void -run_tests_for_pipe(data_t *data, enum pipe pipe) -{ - int plane; + igt_subtest_f("plane-position-hole-pipe-%s-planes", + kmstest_pipe_name(pipe)) { + int n_planes = data->display.pipes[pipe].n_planes; + for (int plane = 1; plane < n_planes; plane++) + test_plane_position(data, pipe, plane, 0); + } + + igt_subtest_f("plane-position-hole-dpms-pipe-%s-planes", + kmstest_pipe_name(pipe)) { + int n_planes = data->display.pipes[pipe].n_planes; + for (int plane = 1; plane < n_planes; plane++) + test_plane_position(data, pipe, plane, + TEST_DPMS); + } + + igt_subtest_f("plane-panning-top-left-pipe-%s-planes", + kmstest_pipe_name(pipe)) { + int n_planes = data->display.pipes[pipe].n_planes; + for (int plane = 1; plane < n_planes; plane++) + test_plane_panning(data, pipe, plane, TEST_PANNING_TOP_LEFT); + } - for (plane = 1; plane < IGT_MAX_PLANES; plane++) - run_tests_for_pipe_plane(data, pipe, plane); + igt_subtest_f("plane-panning-bottom-right-pipe-%s-planes", + kmstest_pipe_name(pipe)) { + int n_planes = data->display.pipes[pipe].n_planes; + for (int plane = 1; plane < n_planes; plane++) + test_plane_panning(data, pipe, plane, + TEST_PANNING_BOTTOM_RIGHT); + } + + igt_subtest_f("plane-panning-bottom-right-suspend-pipe-%s-planes", + kmstest_pipe_name(pipe)) { + int n_planes = data->display.pipes[pipe].n_planes; + for (int plane = 1; plane < n_planes; plane++) + test_plane_panning(data, pipe, plane, + TEST_PANNING_BOTTOM_RIGHT | + TEST_SUSPEND_RESUME); + } } + static data_t data; igt_main @@ -425,7 +435,7 @@ igt_main } for (int pipe = 0; pipe < I915_MAX_PIPES; pipe++) - run_tests_for_pipe(&data, pipe); + run_tests_for_pipe_plane(&data, pipe); igt_fixture { igt_display_fini(&data.display);