From patchwork Tue Jan 24 23:34:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9536153 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 3BB4D601D3 for ; Tue, 24 Jan 2017 23:35:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F0E426E69 for ; Tue, 24 Jan 2017 23:35:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23F2B27BA5; Tue, 24 Jan 2017 23:35:47 +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 BCADF26E69 for ; Tue, 24 Jan 2017 23:35:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DBA96E8E9; Tue, 24 Jan 2017 23:35:28 +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 B87AB6E8DA for ; Tue, 24 Jan 2017 23:35:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id A82A12612F4 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:34:00 -0500 Message-Id: <20170124233400.5053-34-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 33/33] lib/igt_kms: Remove code obsoleted by dyn n_planes implementation 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 Due to the dyn n_planes implementation some attributes and functions were made obsolete and cand be removed. However to keep all of the tests building the obsolete code is removed after all of the tests have been made compatible with the dyn n_planes changes. Signed-off-by: Robert Foss Reviewed-by: Mika Kahola --- lib/igt_kms.c | 28 ---------------------------- lib/igt_kms.h | 20 -------------------- 2 files changed, 48 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index bfe5eab4..75225881 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -342,32 +342,6 @@ int kmstest_pipe_to_index(char pipe) } /** - * kmstest_plane_name: - * @plane: display plane - * - * Returns: String representing @plane, e.g. "plane1". - */ -const char *kmstest_plane_name(enum igt_plane plane) -{ - static const char *names[] = { - [IGT_PLANE_1] = "plane1", - [IGT_PLANE_2] = "plane2", - [IGT_PLANE_3] = "plane3", - [IGT_PLANE_4] = "plane4", - [IGT_PLANE_5] = "plane5", - [IGT_PLANE_6] = "plane6", - [IGT_PLANE_7] = "plane7", - [IGT_PLANE_8] = "plane8", - [IGT_PLANE_9] = "plane9", - [IGT_PLANE_CURSOR] = "cursor", - }; - - igt_assert(plane < ARRAY_SIZE(names) && names[plane]); - - return names[plane]; -} - -/** * kmstest_plane_type_name: * @plane: display plane * @@ -1633,7 +1607,6 @@ void igt_display_init(igt_display_t *display, int drm_fd) plane = &pipe->planes[p]; plane->index = p++; } - plane->is_primary = 1; break; case DRM_PLANE_TYPE_CURSOR: if (pipe->plane_cursor == -1) { @@ -1645,7 +1618,6 @@ void igt_display_init(igt_display_t *display, int drm_fd) plane->index = p++; } display->has_cursor_plane = true; - plane->is_cursor = 1; break; default: plane = &pipe->planes[p]; diff --git a/lib/igt_kms.h b/lib/igt_kms.h index dea50df3..f34f22f6 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -58,24 +58,6 @@ enum pipe { }; const char *kmstest_pipe_name(enum pipe pipe); int kmstest_pipe_to_index(char pipe); - -/* We namespace this enum to not conflict with the Android i915_drm.h */ -enum igt_plane { - IGT_PLANE_1 = 0, - IGT_PLANE_PRIMARY = IGT_PLANE_1, - IGT_PLANE_2, - IGT_PLANE_3, - IGT_PLANE_4, - IGT_PLANE_5, - IGT_PLANE_6, - IGT_PLANE_7, - IGT_PLANE_8, - IGT_PLANE_9, - IGT_PLANE_CURSOR, /* IGT_PLANE_CURSOR is always the last plane. */ - IGT_MAX_PLANES, -}; - -const char *kmstest_plane_name(enum igt_plane plane); const char *kmstest_plane_type_name(int plane_type); enum port { @@ -258,8 +240,6 @@ typedef struct { int index; /* capabilities */ int type; - unsigned int is_primary : 1; - unsigned int is_cursor : 1; /* state tracking */ unsigned int fb_changed : 1; unsigned int position_changed : 1;