From patchwork Tue Jan 24 23:33:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9536103 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 D746D601D3 for ; Tue, 24 Jan 2017 23:34:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCC62271BC for ; Tue, 24 Jan 2017 23:34:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1C0227BA5; Tue, 24 Jan 2017 23:34:43 +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 75002271BC for ; Tue, 24 Jan 2017 23:34:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 033B66E8A4; Tue, 24 Jan 2017 23:34:43 +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 8BA726E8A4 for ; Tue, 24 Jan 2017 23:34:41 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 74C43269EFA From: Robert Foss To: intel-gfx@lists.freedesktop.org, Tomeu Vizoso , Maarten Lankhorst , Gustavo Padovan , Daniel Stone , Mika Kahola , Petri Latvala Date: Tue, 24 Jan 2017 18:33:36 -0500 Message-Id: <20170124233400.5053-10-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0.453.g787f75f05 In-Reply-To: <20170124233400.5053-1-robert.foss@collabora.com> References: <20170124233400.5053-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v2 09/33] tests/kms_cursor_crc: 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_cursor_crc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c index ff931607..4851e18f 100644 --- a/tests/kms_cursor_crc.c +++ b/tests/kms_cursor_crc.c @@ -92,7 +92,7 @@ static void cursor_enable(data_t *data) igt_output_t *output = data->output; igt_plane_t *cursor; - cursor = igt_output_get_plane(output, IGT_PLANE_CURSOR); + cursor = igt_output_get_plane_type(output, DRM_PLANE_TYPE_CURSOR); igt_plane_set_fb(cursor, &data->fb); igt_plane_set_size(cursor, data->curw, data->curh); } @@ -102,7 +102,7 @@ static void cursor_disable(data_t *data) igt_output_t *output = data->output; igt_plane_t *cursor; - cursor = igt_output_get_plane(output, IGT_PLANE_CURSOR); + cursor = igt_output_get_plane_type(output, DRM_PLANE_TYPE_CURSOR); igt_plane_set_fb(cursor, NULL); } @@ -120,7 +120,7 @@ static void do_single_test(data_t *data, int x, int y) /* Hardware test */ igt_paint_test_pattern(cr, data->screenw, data->screenh); cursor_enable(data); - cursor = igt_output_get_plane(data->output, IGT_PLANE_CURSOR); + cursor = igt_output_get_plane_type(data->output, DRM_PLANE_TYPE_CURSOR); igt_plane_set_position(cursor, x, y); igt_display_commit(display); igt_wait_for_vblank(data->drm_fd, data->pipe); @@ -174,7 +174,7 @@ static void do_fail_test(data_t *data, int x, int y, int expect) /* Hardware test */ igt_paint_test_pattern(cr, data->screenw, data->screenh); cursor_enable(data); - cursor = igt_output_get_plane(data->output, IGT_PLANE_CURSOR); + cursor = igt_output_get_plane_type(data->output, DRM_PLANE_TYPE_CURSOR); igt_plane_set_position(cursor, x, y); ret = igt_display_try_commit2(display, COMMIT_LEGACY); @@ -301,7 +301,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, 0.0, 0.0, 0.0, &data->primary_fb); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_plane_set_fb(primary, &data->primary_fb); igt_display_commit(display); @@ -342,7 +342,7 @@ static void cleanup_crtc(data_t *data, igt_output_t *output) igt_remove_fb(data->drm_fd, &data->primary_fb); - primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_plane_set_fb(primary, NULL); igt_output_set_pipe(output, PIPE_ANY);