aboutsummaryrefslogtreecommitdiff
path: root/backend/drm/util.c
diff options
context:
space:
mode:
Diffstat (limited to 'backend/drm/util.c')
-rw-r--r--backend/drm/util.c88
1 files changed, 11 insertions, 77 deletions
diff --git a/backend/drm/util.c b/backend/drm/util.c
index 0f424416..03c4b0b4 100644
--- a/backend/drm/util.c
+++ b/backend/drm/util.c
@@ -48,82 +48,6 @@ enum wlr_output_mode_aspect_ratio get_picture_aspect_ratio(const drmModeModeInfo
}
}
-// Constructed from http://edid.tv/manufacturer
-static const char *get_manufacturer(uint16_t id) {
-#define ID(a, b, c) ((a & 0x1f) << 10) | ((b & 0x1f) << 5) | (c & 0x1f)
- switch (id) {
- case ID('A', 'A', 'A'): return "Avolites Ltd";
- case ID('A', 'C', 'I'): return "Ancor Communications Inc";
- case ID('A', 'C', 'R'): return "Acer Technologies";
- case ID('A', 'D', 'A'): return "Addi-Data GmbH";
- case ID('A', 'P', 'P'): return "Apple Computer Inc";
- case ID('A', 'S', 'K'): return "Ask A/S";
- case ID('A', 'V', 'T'): return "Avtek (Electronics) Pty Ltd";
- case ID('B', 'N', 'O'): return "Bang & Olufsen";
- case ID('B', 'N', 'Q'): return "BenQ Corporation";
- case ID('C', 'M', 'N'): return "Chimei Innolux Corporation";
- case ID('C', 'M', 'O'): return "Chi Mei Optoelectronics corp.";
- case ID('C', 'R', 'O'): return "Extraordinary Technologies PTY Limited";
- case ID('D', 'E', 'L'): return "Dell Inc.";
- case ID('D', 'G', 'C'): return "Data General Corporation";
- case ID('D', 'O', 'N'): return "DENON, Ltd.";
- case ID('E', 'N', 'C'): return "Eizo Nanao Corporation";
- case ID('E', 'P', 'H'): return "Epiphan Systems Inc.";
- case ID('E', 'X', 'P'): return "Data Export Corporation";
- case ID('F', 'N', 'I'): return "Funai Electric Co., Ltd.";
- case ID('F', 'U', 'S'): return "Fujitsu Siemens Computers GmbH";
- case ID('G', 'S', 'M'): return "Goldstar Company Ltd";
- case ID('H', 'I', 'Q'): return "Kaohsiung Opto Electronics Americas, Inc.";
- case ID('H', 'S', 'D'): return "HannStar Display Corp";
- case ID('H', 'T', 'C'): return "Hitachi Ltd";
- case ID('H', 'W', 'P'): return "Hewlett Packard";
- case ID('I', 'N', 'T'): return "Interphase Corporation";
- case ID('I', 'N', 'X'): return "Communications Supply Corporation (A division of WESCO)";
- case ID('I', 'T', 'E'): return "Integrated Tech Express Inc";
- case ID('I', 'V', 'M'): return "Iiyama North America";
- case ID('L', 'E', 'N'): return "Lenovo Group Limited";
- case ID('M', 'A', 'X'): return "Rogen Tech Distribution Inc";
- case ID('M', 'E', 'G'): return "Abeam Tech Ltd";
- case ID('M', 'E', 'I'): return "Panasonic Industry Company";
- case ID('M', 'T', 'C'): return "Mars-Tech Corporation";
- case ID('M', 'T', 'X'): return "Matrox";
- case ID('N', 'E', 'C'): return "NEC Corporation";
- case ID('N', 'E', 'X'): return "Nexgen Mediatech Inc.";
- case ID('O', 'N', 'K'): return "ONKYO Corporation";
- case ID('O', 'R', 'N'): return "ORION ELECTRIC CO., LTD.";
- case ID('O', 'T', 'M'): return "Optoma Corporation";
- case ID('O', 'V', 'R'): return "Oculus VR, Inc.";
- case ID('P', 'H', 'L'): return "Philips Consumer Electronics Company";
- case ID('P', 'I', 'O'): return "Pioneer Electronic Corporation";
- case ID('P', 'N', 'R'): return "Planar Systems, Inc.";
- case ID('Q', 'D', 'S'): return "Quanta Display Inc.";
- case ID('R', 'A', 'T'): return "Rent-A-Tech";
- case ID('R', 'E', 'N'): return "Renesas Technology Corp.";
- case ID('S', 'A', 'M'): return "Samsung Electric Company";
- case ID('S', 'A', 'N'): return "Sanyo Electric Co., Ltd.";
- case ID('S', 'E', 'C'): return "Seiko Epson Corporation";
- case ID('S', 'H', 'P'): return "Sharp Corporation";
- case ID('S', 'I', 'I'): return "Silicon Image, Inc.";
- case ID('S', 'N', 'Y'): return "Sony";
- case ID('S', 'T', 'D'): return "STD Computer Inc";
- case ID('S', 'V', 'S'): return "SVSI";
- case ID('S', 'Y', 'N'): return "Synaptics Inc";
- case ID('T', 'C', 'L'): return "Technical Concepts Ltd";
- case ID('T', 'O', 'P'): return "Orion Communications Co., Ltd.";
- case ID('T', 'S', 'B'): return "Toshiba America Info Systems Inc";
- case ID('T', 'S', 'T'): return "Transtream Inc";
- case ID('U', 'N', 'K'): return "Unknown";
- case ID('V', 'E', 'S'): return "Vestel Elektronik Sanayi ve Ticaret A. S.";
- case ID('V', 'I', 'T'): return "Visitech AS";
- case ID('V', 'I', 'Z'): return "VIZIO, Inc";
- case ID('V', 'L', 'V'): return "Valve";
- case ID('V', 'S', 'C'): return "ViewSonic Corporation";
- case ID('Y', 'M', 'H'): return "Yamaha Corporation";
- default: return "Unknown";
- }
-#undef ID
-}
-
/* See https://en.wikipedia.org/wiki/Extended_Display_Identification_Data for layout of EDID data.
* We don't parse the EDID properly. We just expect to receive valid data.
*/
@@ -142,7 +66,17 @@ void parse_edid(struct wlr_drm_connector *conn, size_t len, const uint8_t *data)
}
uint16_t id = (data[8] << 8) | data[9];
- output->make = strdup(get_manufacturer(id));
+ const char *manu = get_pnp_manufacturer(id);
+ char pnp_id[4];
+ if (!manu) {
+ // The ASCII 3-letter manufacturer PnP ID is encoded in 5-bit codes
+ pnp_id[0] = ((id >> 10) & 0x1F) + '@';
+ pnp_id[1] = ((id >> 5) & 0x1F) + '@';
+ pnp_id[2] = ((id >> 0) & 0x1F) + '@';
+ pnp_id[3] = '\0';
+ manu = pnp_id;
+ }
+ output->make = strdup(manu);
uint16_t model = data[10] | (data[11] << 8);
char model_str[32];