From patchwork Fri Nov 28 16:22:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 5404941 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0DD75BEEA8 for ; Fri, 28 Nov 2014 16:22:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D39002013A for ; Fri, 28 Nov 2014 16:22:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8E0252011B for ; Fri, 28 Nov 2014 16:22:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2764A6E0D7; Fri, 28 Nov 2014 08:22:34 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BF3A6EF0B for ; Fri, 28 Nov 2014 08:22:31 -0800 (PST) Received: by mail-wi0-f172.google.com with SMTP id n3so19042476wiv.5 for ; Fri, 28 Nov 2014 08:22:30 -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:subject:date:message-id:in-reply-to :references; bh=Nd6K4xo2dY8QvDnzPixlScdtFnJMZk1h6+61E+DMVCs=; b=dV6PinqvEeY0lpY2dFkg78iwbYe4SsUIihZwXDUwjl0VFP7+MII6doCqkcAdFsjA33 RbfjXdRB9Odnpm5wa9ES9XhF3vs7T40JtJYVE8JNdUa46w4CVt+ifsSzjzxAa7kepDhW wPGtj2WxvaUmVrofynzVRW5pdejITkIbaqdU5HyNyiyFR/9gPuL3zBLpqnscp+4exs/9 4/qUYFeSJmHmhrrTNONjONzGbCD+Sqyoz9b+IwCZi/inT5m4JFBg+uc77IZBmxCuOSQq pzDrTjluwBxAlmvZobgV6ldGxH1BzwwRrZfHOh09xRK7EZ3Quxjcc1hcfqScRkJLeJ6a GsxQ== X-Gm-Message-State: ALoCoQnsndXV/ptol5SSaa1ziEBLYqUhPaMP4uYnUzeBMKmRksTy7bVQWLPiNCOIzlYjrm1PPStd X-Received: by 10.194.92.116 with SMTP id cl20mr72132424wjb.71.1417191750426; Fri, 28 Nov 2014 08:22:30 -0800 (PST) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id gy8sm30170135wib.3.2014.11.28.08.22.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Nov 2014 08:22:29 -0800 (PST) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Fri, 28 Nov 2014 16:22:24 +0000 Message-Id: <1417191744-5767-4-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417191744-5767-1-git-send-email-thomas.wood@intel.com> References: <1417191744-5767-1-git-send-email-thomas.wood@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 4/4] lib: remove igt_edid.h 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 This has been replaced by igt_kms_get_base_edid(). Signed-off-by: Thomas Wood --- .../intel-gpu-tools/intel-gpu-tools-docs.xml | 1 - lib/Makefile.sources | 1 - lib/igt_edid.h | 125 --------------------- lib/igt_kms.c | 4 +- lib/igt_kms.h | 21 +--- tests/kms_3d.c | 1 - tests/kms_force_connector.c | 1 - 7 files changed, 2 insertions(+), 152 deletions(-) delete mode 100644 lib/igt_edid.h diff --git a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml index 07ced05..0530c5a 100644 --- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml +++ b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml @@ -26,7 +26,6 @@ - diff --git a/lib/Makefile.sources b/lib/Makefile.sources index eee145f..819b21a 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -44,7 +44,6 @@ libintel_tools_la_SOURCES = \ intel_iosf.c \ igt_kms.c \ igt_kms.h \ - igt_edid.h \ igt_fb.c \ igt_fb.h \ igt_core.c \ diff --git a/lib/igt_edid.h b/lib/igt_edid.h deleted file mode 100644 index 27373b7..0000000 --- a/lib/igt_edid.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * generic edid taken from Linux, drivers/gpu/drm/drm_edid_load.c: - * - * - drm_edid_load.c: use a built-in EDID data set or load it via the firmware - interface - - Copyright (C) 2012 Carsten Emde - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef __IGT_EDID_H__ -#define __IGT_EDID_H__ - -#include "igt_kms.h" - -#define EDID_LENGTH 128 - -static const unsigned char generic_edid[MAX_EDIDS][EDID_LENGTH] = { - { - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x05, 0x16, 0x01, 0x03, 0x6d, 0x23, 0x1a, 0x78, - 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25, - 0x20, 0x50, 0x54, 0x00, 0x08, 0x00, 0x61, 0x40, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x64, 0x19, - 0x00, 0x40, 0x41, 0x00, 0x26, 0x30, 0x08, 0x90, - 0x36, 0x00, 0x63, 0x0a, 0x11, 0x00, 0x00, 0x18, - 0x00, 0x00, 0x00, 0xff, 0x00, 0x4c, 0x69, 0x6e, - 0x75, 0x78, 0x20, 0x23, 0x30, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x3b, - 0x3d, 0x2f, 0x31, 0x07, 0x00, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, - 0x00, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x58, - 0x47, 0x41, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x55, - }, - { - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x05, 0x16, 0x01, 0x03, 0x6d, 0x2c, 0x23, 0x78, - 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25, - 0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0x81, 0x80, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x30, 0x2a, - 0x00, 0x98, 0x51, 0x00, 0x2a, 0x40, 0x30, 0x70, - 0x13, 0x00, 0xbc, 0x63, 0x11, 0x00, 0x00, 0x1e, - 0x00, 0x00, 0x00, 0xff, 0x00, 0x4c, 0x69, 0x6e, - 0x75, 0x78, 0x20, 0x23, 0x30, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x3b, - 0x3d, 0x3e, 0x40, 0x0b, 0x00, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, - 0x00, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x53, - 0x58, 0x47, 0x41, 0x0a, 0x20, 0x20, 0x00, 0xa0, - }, - { - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x05, 0x16, 0x01, 0x03, 0x6d, 0x37, 0x29, 0x78, - 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25, - 0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xa9, 0x40, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x48, 0x3f, - 0x40, 0x30, 0x62, 0xb0, 0x32, 0x40, 0x40, 0xc0, - 0x13, 0x00, 0x2b, 0xa0, 0x21, 0x00, 0x00, 0x1e, - 0x00, 0x00, 0x00, 0xff, 0x00, 0x4c, 0x69, 0x6e, - 0x75, 0x78, 0x20, 0x23, 0x30, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x3b, - 0x3d, 0x4a, 0x4c, 0x11, 0x00, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, - 0x00, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x55, - 0x58, 0x47, 0x41, 0x0a, 0x20, 0x20, 0x00, 0x9d, - }, - { - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x05, 0x16, 0x01, 0x03, 0x6d, 0x2b, 0x1b, 0x78, - 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25, - 0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xb3, 0x00, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x21, 0x39, - 0x90, 0x30, 0x62, 0x1a, 0x27, 0x40, 0x68, 0xb0, - 0x36, 0x00, 0xb5, 0x11, 0x11, 0x00, 0x00, 0x1e, - 0x00, 0x00, 0x00, 0xff, 0x00, 0x4c, 0x69, 0x6e, - 0x75, 0x78, 0x20, 0x23, 0x30, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x3b, - 0x3d, 0x40, 0x42, 0x0f, 0x00, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, - 0x00, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x57, - 0x53, 0x58, 0x47, 0x41, 0x0a, 0x20, 0x00, 0x26, - }, - { - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x05, 0x16, 0x01, 0x03, 0x6d, 0x32, 0x1c, 0x78, - 0xea, 0x5e, 0xc0, 0xa4, 0x59, 0x4a, 0x98, 0x25, - 0x20, 0x50, 0x54, 0x00, 0x00, 0x00, 0xd1, 0xc0, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x3a, - 0x80, 0x18, 0x71, 0x38, 0x2d, 0x40, 0x58, 0x2c, - 0x45, 0x00, 0xf4, 0x19, 0x11, 0x00, 0x00, 0x1e, - 0x00, 0x00, 0x00, 0xff, 0x00, 0x4c, 0x69, 0x6e, - 0x75, 0x78, 0x20, 0x23, 0x30, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x3b, - 0x3d, 0x42, 0x44, 0x0f, 0x00, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, - 0x00, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x46, - 0x48, 0x44, 0x0a, 0x20, 0x20, 0x20, 0x00, 0x05, - } -}; - -#endif /* __IGT_EDID_H__ */ diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 094f8c1..e6a5f91 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -44,7 +44,6 @@ #include "igt_aux.h" #include "intel_chipset.h" #include "igt_debugfs.h" -#include "igt_edid.h" /* * There hasn't been a release of libdrm containing these #define's yet, so @@ -460,8 +459,7 @@ bool kmstest_force_connector(int drm_fd, drmModeConnector *connector, * @length: length of the EDID data. #EDID_LENGTH defines the standard EDID * length * - * Set the EDID data on @connector to @edid. See #generic_edid and - * #kmstest_generic_edid for a set of generic EDID data blocks. + * Set the EDID data on @connector to @edid. See also #igt_kms_get_base_edid. * * If @length is zero, the forced EDID will be removed. */ diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 991b34a..a1483a4 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -127,26 +127,6 @@ enum kmstest_force_connector_state { FORCE_CONNECTOR_OFF }; - -/** - * kmstest_generic_edid: - * @EDID_XGA: 1024x768 - * @EDID_SXGA: 1280x1024 - * @EDID_UXGA: 1600x1200 - * @EDID_WSXGA: 1680x1050 - * @EDID_FHD: 1920x1080 - * @MAX_EDIDS: Size of #generic_edid array - */ -enum kmstest_generic_edid { - EDID_XGA, /* 1024x768 */ - EDID_SXGA, /* 1280x1024 */ - EDID_UXGA, /* 1600x1200 */ - EDID_WSXGA, /* 1680x1050 */ - EDID_FHD, /* 1920x1080 */ - - MAX_EDIDS -}; - bool kmstest_force_connector(int fd, drmModeConnector *connector, enum kmstest_force_connector_state state); void kmstest_edid_add_3d(const unsigned char *edid, size_t length, unsigned char *new_edid_ptr[], size_t *new_length); @@ -292,6 +272,7 @@ void igt_wait_for_vblank(int drm_fd, enum pipe pipe); void igt_enable_connectors(void); void igt_reset_connectors(void); +#define EDID_LENGTH 128 const unsigned char* igt_kms_get_base_edid(void); diff --git a/tests/kms_3d.c b/tests/kms_3d.c index 6b1c1b3..6588d9d 100644 --- a/tests/kms_3d.c +++ b/tests/kms_3d.c @@ -25,7 +25,6 @@ #include "igt_core.h" #include "igt_kms.h" #include "drmtest.h" -#include "igt_edid.h" IGT_TEST_DESCRIPTION("Tests 3D mode setting."); diff --git a/tests/kms_force_connector.c b/tests/kms_force_connector.c index 4a50791..e11a621 100644 --- a/tests/kms_force_connector.c +++ b/tests/kms_force_connector.c @@ -25,7 +25,6 @@ #include "igt_core.h" #include "igt_kms.h" #include "drmtest.h" -#include "igt_edid.h" #define CHECK_MODE(m, h, w, r) igt_assert(m.hdisplay == h && m.vdisplay == w \ && m.vrefresh == r)