From patchwork Fri Apr 22 13:54:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 8912161 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F1B5A9F39A for ; Fri, 22 Apr 2016 13:55:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 397A32024F for ; Fri, 22 Apr 2016 13:55:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 51402201F5 for ; Fri, 22 Apr 2016 13:55:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CCF06EEF2; Fri, 22 Apr 2016 13:55:18 +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 A81516EEF0 for ; Fri, 22 Apr 2016 13:55:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 0FE81260B44 From: robert.foss@collabora.com To: daniel.vetter@intel.com Date: Fri, 22 Apr 2016 09:54:52 -0400 Message-Id: <1461333296-9226-3-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461333296-9226-1-git-send-email-robert.foss@collabora.com> References: <1461333296-9226-1-git-send-email-robert.foss@collabora.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH i-g-t v2 2/6] lib/igt_kms: Add support for up to 10 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-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Foss Increase the number of planes supported to 10. kmstest_plane_name only previously supported 4 planes, this patch adds support for up to 10 planes. Signed-off-by: Robert Foss --- lib/igt_kms.c | 6 ++++++ lib/igt_kms.h | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index ef24a49..36ecd4a 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -320,6 +320,12 @@ const char *kmstest_plane_name(enum igt_plane plane) [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", }; diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 5c83401..b3fe1b2 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -48,12 +48,21 @@ enum pipe { }; const char *kmstest_pipe_name(enum pipe pipe); -/* We namespace this enum to not conflict with the Android i915_drm.h */ +/** + * We namespace this enum to not conflict with the Android i915_drm.h + * IGT_PLANE_CURSOR is always the last plane. + */ 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_MAX_PLANES, };