From patchwork Wed Dec 14 09:05:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9473881 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 82AA960823 for ; Wed, 14 Dec 2016 09:06:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72887286F9 for ; Wed, 14 Dec 2016 09:06:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 675D6286FF; Wed, 14 Dec 2016 09:06:11 +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 2E482286F9 for ; Wed, 14 Dec 2016 09:06:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7E816E76F; Wed, 14 Dec 2016 09:06:07 +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 0DFDF6E75A for ; Wed, 14 Dec 2016 09:05:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 5F797268EC2 From: Robert Foss To: intel-gfx@lists.freedesktop.org, Gustavo Padovan , Brian Starkey , Daniel Vetter , Tomeu Vizoso Date: Wed, 14 Dec 2016 04:05:00 -0500 Message-Id: <20161214090509.15716-4-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161214090509.15716-1-robert.foss@collabora.com> References: <20161214090509.15716-1-robert.foss@collabora.com> Cc: Gustavo Padovan Subject: [Intel-gfx] [PATCH i-g-t v2 03/12] lib/igt_kms: move igt_kms_get_alt_edid() to the right place 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 From: Gustavo Padovan Signed-off-by: Gustavo Padovan Signed-off-by: Robert Foss --- lib/igt_kms.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 989704e1..aa9fd161 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -153,23 +153,6 @@ const unsigned char* igt_kms_get_base_edid(void) #define EDID_NAME alt_edid #include "igt_edid_template.h" -/** - * igt_kms_get_alt_edid: - * - * Get an alternate edid block, which includes the following modes: - * - * - 1400x1050 60Hz - * - 1920x1080 60Hz - * - 1280x720 60Hz - * - 1024x768 60Hz - * - 800x600 60Hz - * - 640x480 60Hz - * - * This can be extended with further features using functions such as - * #kmstest_edid_add_3d. - * - * Returns: an alternate edid block - */ static const char *igt_plane_prop_names[IGT_NUM_PLANE_PROPS] = { "SRC_X", "SRC_Y", @@ -297,6 +280,23 @@ igt_atomic_fill_pipe_props(igt_display_t *display, igt_pipe_t *pipe, drmModeFreeObjectProperties(props); } +/** + * igt_kms_get_alt_edid: + * + * Get an alternate edid block, which includes the following modes: + * + * - 1400x1050 60Hz + * - 1920x1080 60Hz + * - 1280x720 60Hz + * - 1024x768 60Hz + * - 800x600 60Hz + * - 640x480 60Hz + * + * This can be extended with further features using functions such as + * #kmstest_edid_add_3d. + * + * Returns: an alternate edid block + */ const unsigned char* igt_kms_get_alt_edid(void) { update_edid_csum(alt_edid);