From patchwork Wed Feb 1 10:56:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Latvala X-Patchwork-Id: 9549337 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 980BA60236 for ; Wed, 1 Feb 2017 11:03:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84F372840E for ; Wed, 1 Feb 2017 11:03:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 779B72841E; Wed, 1 Feb 2017 11:03:39 +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 13DED2840E for ; Wed, 1 Feb 2017 11:03:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D17C6E783; Wed, 1 Feb 2017 11:03:38 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 390 seconds by postgrey-1.35 at gabe; Wed, 01 Feb 2017 11:03:36 UTC Received: from johanna4.inet.fi (mta-out1.inet.fi [62.71.2.229]) by gabe.freedesktop.org (Postfix) with ESMTP id AC8A36E783 for ; Wed, 1 Feb 2017 11:03:36 +0000 (UTC) RazorGate-KAS: Status: not_detected RazorGate-KAS: Rate: 0 RazorGate-KAS: Envelope from: RazorGate-KAS: Version: 5.5.3 RazorGate-KAS: LuaCore: 215 2015-05-29_17-31-22 60ae4a1b4d01d14f868b20a55aced8d7df7b2e28 RazorGate-KAS: Lua profiles 78662 [Jun 02 2015] RazorGate-KAS: Method: none Received: from hufflepuff.adrinael.net (84.250.112.128) by johanna4.inet.fi (9.0.002.03-2-gbe5d057) id 588B981B00AC7D74; Wed, 1 Feb 2017 12:57:05 +0200 Received: from adrinael by hufflepuff.adrinael.net with local (Exim 4.84_2) (envelope-from ) id 1cYsb3-0001CW-1L; Wed, 01 Feb 2017 12:57:05 +0200 From: Petri Latvala To: intel-gfx@lists.freedesktop.org Date: Wed, 1 Feb 2017 12:56:34 +0200 Message-Id: <1485946594-4563-1-git-send-email-petri.latvala@intel.com> X-Mailer: git-send-email 2.1.4 Cc: Lyude Subject: [Intel-gfx] [PATCH i-g-t] tests/chamelium: Adapt to dynamic number of planes changes 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 CC: Robert Foss CC: Lyude Signed-off-by: Petri Latvala Reviewed-by: Lyude --- tests/chamelium.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/chamelium.c b/tests/chamelium.c index d914d5b..e03acc4 100644 --- a/tests/chamelium.c +++ b/tests/chamelium.c @@ -310,7 +310,7 @@ enable_output(data_t *data, struct igt_fb *fb) { igt_display_t *display = output->display; - igt_plane_t *primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + igt_plane_t *primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); drmModeConnector *connector = chamelium_port_get_connector( data->chamelium, port, false); @@ -341,7 +341,7 @@ disable_output(data_t *data, igt_output_t *output) { igt_display_t *display = output->display; - igt_plane_t *primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + igt_plane_t *primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_assert(primary); /* Disable the display */ @@ -364,7 +364,7 @@ test_display_crc_single(data_t *data, struct chamelium_port *port) output = prepare_output(data, &display, port); connector = chamelium_port_get_connector(data->chamelium, port, false); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_assert(primary); for (i = 0; i < connector->count_modes; i++) { @@ -418,7 +418,7 @@ test_display_crc_multiple(data_t *data, struct chamelium_port *port) output = prepare_output(data, &display, port); connector = chamelium_port_get_connector(data->chamelium, port, false); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_assert(primary); for (i = 0; i < connector->count_modes; i++) { @@ -477,7 +477,7 @@ test_display_frame_dump(data_t *data, struct chamelium_port *port) output = prepare_output(data, &display, port); connector = chamelium_port_get_connector(data->chamelium, port, false); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_assert(primary); for (i = 0; i < connector->count_modes; i++) {