From patchwork Mon Jan 30 14:12:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9545447 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 8A21860417 for ; Mon, 30 Jan 2017 14:13:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B1E127F07 for ; Mon, 30 Jan 2017 14:13:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 601342811E; Mon, 30 Jan 2017 14:13:55 +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 1CEDE27F07 for ; Mon, 30 Jan 2017 14:13:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 939E96E524; Mon, 30 Jan 2017 14:13:30 +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 9592F6E44F for ; Mon, 30 Jan 2017 14:13:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 9A19226A0BE 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:19 -0500 Message-Id: <20170130141224.25063-29-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 28/33] tests/kms_universal_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_universal_plane.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c index 48560212..a2fe1cc1 100644 --- a/tests/kms_universal_plane.c +++ b/tests/kms_universal_plane.c @@ -148,16 +148,16 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) * boolean and show up in userspace as the wrong type. */ for (i = 0; i < display->pipes[pipe].n_planes; i++) - if (display->pipes[pipe].planes[i].is_primary) + if (display->pipes[pipe].planes[i].type == DRM_PLANE_TYPE_PRIMARY) num_primary++; - else if (display->pipes[pipe].planes[i].is_cursor) + else if (display->pipes[pipe].planes[i].type == DRM_PLANE_TYPE_CURSOR) num_cursor++; igt_assert_eq(num_primary, 1); igt_assert_lte(num_cursor, 1); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); - sprite = igt_output_get_plane(output, IGT_PLANE_2); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + sprite = igt_output_get_plane_type(output, DRM_PLANE_TYPE_OVERLAY); if (!sprite) { functional_test_fini(&test, output); igt_skip("No sprite plane available\n"); @@ -369,7 +369,7 @@ sanity_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) sanity_test_init(&test, output, pipe); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); /* Use legacy API to set a mode with a blue FB */ igt_plane_set_fb(primary, &test.blue_fb); @@ -480,7 +480,7 @@ pageflip_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) pageflip_test_init(&test, output, pipe); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); /* Use legacy API to set a mode with a blue FB */ igt_plane_set_fb(primary, &test.blue_fb); @@ -602,8 +602,8 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) &cursor_fb[i]); } - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); - cursor = igt_output_get_plane(output, IGT_PLANE_CURSOR); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + cursor = igt_output_get_plane_type(output, DRM_PLANE_TYPE_CURSOR); if (!primary || !cursor) { cursor_leak_test_fini(data, output, &background_fb, cursor_fb); igt_skip("Primary and/or cursor are unavailable\n"); @@ -706,7 +706,7 @@ gen9_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output) gen9_test_init(&test, output, pipe); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); /* Start with a full-screen primary plane */ igt_plane_set_fb(primary, &test.biggreen_fb);