lib: remove igt_edid.h

This has been replaced by igt_kms_get_base_edid().

Signed-off-by: Thomas Wood <thomas.wood@intel.com>

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 2115097..9cfb836 100644 (file)
--- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
+++ b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
@@ -25,7 +25,6 @@
     <xi:include href="xml/intel_batchbuffer.xml"/>
     <xi:include href="xml/intel_chipset.xml"/>
     <xi:include href="xml/intel_io.xml"/>
-    <xi:include href="xml/igt_edid.xml"/>
   </chapter>
   <xi:include href="xml/igt_test_programs.xml"/>
   <index id="api-index-full">

diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index eee145f..819b21a 100644 (file)
--- 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 (file)
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 <C.Emde@osadl.org>
-
-   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 (file)
--- 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 (file)
--- 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 (file)
--- 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 93f72d7..42aaa7f 100644 (file)
--- 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"
 
 IGT_TEST_DESCRIPTION("Check the debugfs force connector/edid features work"
                     " correctly.");