From patchwork Fri Jan 20 17:45:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9529099 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 3EA576045F for ; Fri, 20 Jan 2017 17:47:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F40B2868C for ; Fri, 20 Jan 2017 17:47:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 212A3286C0; Fri, 20 Jan 2017 17:47:24 +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 DF0612868C for ; Fri, 20 Jan 2017 17:47:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 66D556EC31; Fri, 20 Jan 2017 17:47:17 +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 349BE6EC2C for ; Fri, 20 Jan 2017 17:47:07 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id CC77E2603D9 From: Robert Foss To: intel-gfx@lists.freedesktop.org, Tomeu Vizoso , Maarten Lankhorst , Gustavo Padovan , Daniel Stone , Mika Kahola Date: Fri, 20 Jan 2017 12:45:38 -0500 Message-Id: <20170120174554.14195-17-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170120174554.14195-1-robert.foss@collabora.com> References: <20170120174554.14195-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v1 16/32] tests/kms_mmio_vs_cs_flip: 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 --- tests/kms_mmio_vs_cs_flip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/kms_mmio_vs_cs_flip.c b/tests/kms_mmio_vs_cs_flip.c index 2f64f633..09217b31 100644 --- a/tests/kms_mmio_vs_cs_flip.c +++ b/tests/kms_mmio_vs_cs_flip.c @@ -191,7 +191,7 @@ static void make_gpu_busy(data_t *data, uint32_t flip_handle) * supposed to be. */ static void -test_plane(data_t *data, igt_output_t *output, enum pipe pipe, enum igt_plane plane) +test_plane(data_t *data, igt_output_t *output, enum pipe pipe, int plane) { struct igt_fb red_fb, green_fb, blue_fb; drmModeModeInfo *mode; @@ -201,7 +201,7 @@ test_plane(data_t *data, igt_output_t *output, enum pipe pipe, enum igt_plane pl igt_output_set_pipe(output, pipe); - 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); mode = igt_output_get_mode(output); @@ -455,7 +455,7 @@ static void run_plane_test(data_t *data) { igt_output_t *output; - enum igt_plane plane = 1; /* testing with one sprite is enough */ + int plane = 1; /* testing with one sprite is enough */ int valid_tests = 0; enum pipe pipe;