From patchwork Fri Jun 14 21:34:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2725001 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7DBC19F8E4 for ; Fri, 14 Jun 2013 21:49:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B2706202C6 for ; Fri, 14 Jun 2013 21:49:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E8F49202B4 for ; Fri, 14 Jun 2013 21:49:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F31E0E5DBC for ; Fri, 14 Jun 2013 14:49:37 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [95.142.166.194]) by gabe.freedesktop.org (Postfix) with ESMTP id 577B2E5C8A for ; Fri, 14 Jun 2013 14:35:15 -0700 (PDT) Received: from avalon.ideasonboard.com (unknown [91.177.128.27]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 15F0135A55; Fri, 14 Jun 2013 23:35:07 +0200 (CEST) From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH v6 07/23] modetest: Don't limit mode set and planes to two instances Date: Fri, 14 Jun 2013 23:34:41 +0200 Message-Id: <1371245697-29504-8-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1371245697-29504-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1371245697-29504-1-git-send-email-laurent.pinchart@ideasonboard.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.5 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 Configuring mode on more than two connectors or two planes is perfectly valid. Support it. Signed-off-by: Laurent Pinchart --- tests/modetest/modetest.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 8ad138e..778af62 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -1067,8 +1067,8 @@ int main(int argc, char **argv) char *module = NULL; unsigned int i; int count = 0, plane_count = 0; - struct connector_arg con_args[2]; - struct plane_arg plane_args[2] = { { 0, }, }; + struct connector_arg *con_args = NULL; + struct plane_arg *plane_args = NULL; unsigned int args = 0; opterr = 0; @@ -1097,8 +1097,16 @@ int main(int argc, char **argv) modes = 1; break; case 'P': + plane_args = realloc(plane_args, + (plane_count + 1) * sizeof *plane_args); + if (plane_args == NULL) { + fprintf(stderr, "memory allocation failed\n"); + return 1; + } + if (parse_plane(&plane_args[plane_count], optarg) < 0) usage(argv[0]); + plane_count++; break; case 'p': @@ -1106,8 +1114,16 @@ int main(int argc, char **argv) planes = 1; break; case 's': + con_args = realloc(con_args, + (count + 1) * sizeof *con_args); + if (con_args == NULL) { + fprintf(stderr, "memory allocation failed\n"); + return 1; + } + if (parse_connector(&con_args[count], optarg) < 0) usage(argv[0]); + count++; break; case 'v':