diff options
| author | emersion <contact@emersion.fr> | 2017-12-11 16:14:03 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-12-11 16:14:03 +0100 |
| commit | c67a5824b8831b50e9f3b09cc182f496fb973321 (patch) | |
| tree | 0a4f6090819e680bcd611388c8cbe867fbb4983a /backend/drm/util.c | |
| parent | 6001235b0465ba1961f8abd66a860bcf1f14fc22 (diff) | |
| parent | 808ab5aa1bd990776ae30d5f9bb171ca7b42d6ef (diff) | |
Merge branch 'master' into display-destroy
Diffstat (limited to 'backend/drm/util.c')
| -rw-r--r-- | backend/drm/util.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/backend/drm/util.c b/backend/drm/util.c index c27d7b67..25256343 100644 --- a/backend/drm/util.c +++ b/backend/drm/util.c @@ -93,6 +93,12 @@ void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *d uint16_t id = (data[8] << 8) | data[9]; snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id)); + uint16_t model = data[10] | (data[11] << 8); + snprintf(output->model, sizeof(output->model), "0x%04X", model); + + uint32_t serial = data[12] | (data[13] << 8) | (data[14] << 8) | (data[15] << 8); + snprintf(output->serial, sizeof(output->serial), "0x%08X", serial); + output->phys_width = ((data[68] & 0xf0) << 4) | data[66]; output->phys_height = ((data[68] & 0x0f) << 8) | data[67]; |