From patchwork Mon Nov 14 09:59:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9426951 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 87B8A60471 for ; Mon, 14 Nov 2016 09:59:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E808286D4 for ; Mon, 14 Nov 2016 09:59:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7383A286E5; Mon, 14 Nov 2016 09:59:55 +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 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 3FC11286D4 for ; Mon, 14 Nov 2016 09:59:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5963E6E39C; Mon, 14 Nov 2016 09:59:50 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5824C6E392; Mon, 14 Nov 2016 09:59:47 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id y68so5966611pfb.1; Mon, 14 Nov 2016 01:59:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kZeCAags/0qxBeoMJ9XsHLymJkR+Ja9tM+H3ihv3+B0=; b=ch8F/Ac9uAA3PtWAV6yjsReaLaOP+ilnQw+S7QSMhdpRRtrGX1DOJW7JznQ7qAHHLT hgmyLErKJBv6vAcjsUX6ZJnJCnfUQyJ3hlKE1EM7C88J+TkY4304254XQ8SZWA7oKNkG s4A7Qc/SemL2WbdLFN9RKEkJUfTkxnkWlIShvOlVm2R+ryqG/eijsRZssipbmWAfDZo6 gSyFcXStl7iRdZOT7PCrhNlZRcnb/3kLL4BuWP43L4ZgQvaPqkr/TN2Inp2R1YrjrLoe ixnN/YAN3R2BHEC5935H/9M05waUmzmoHiXerAie1E1l9qqJea2ZO3qmH7AuQ8JEykWn m9xQ== X-Gm-Message-State: ABUngvdey8G68GUqjRx62LyybcOQ/8ormRBfGry7cjfSyedAjue/S5+bVcod/yIxGu5LtQ== X-Received: by 10.99.230.17 with SMTP id g17mr27963282pgh.82.1479117586658; Mon, 14 Nov 2016 01:59:46 -0800 (PST) Received: from jade.nodan1.kt.home.ne.jp (202-72-64-164.koalanet.ne.jp. [202.72.64.164]) by smtp.gmail.com with ESMTPSA id p125sm14320235pfg.33.2016.11.14.01.59.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 01:59:46 -0800 (PST) From: Gustavo Padovan To: intel-gfx@lists.freedesktop.org Date: Mon, 14 Nov 2016 18:59:17 +0900 Message-Id: <1479117566-17709-6-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1479117566-17709-1-git-send-email-gustavo@padovan.org> References: <1479117566-17709-1-git-send-email-gustavo@padovan.org> Cc: Gustavo Padovan , dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 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 --- 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 989704e..aa9fd16 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);