From 91d72040e588c500e8017c6ad824a96ed4180996 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 7 Dec 2017 13:59:19 +0100 Subject: Configure outputs with make, model, serial in rootston Added fallbacks in DRM backend in case EDID extension data for model and serial is missing. Updates #403 --- backend/drm/util.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'backend/drm') 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]; -- cgit v1.2.3