diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-07 10:15:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 10:15:00 -0500 |
| commit | f469784bbc73bf6346430a2caa7dc366ad2d0308 (patch) | |
| tree | d88096760223a2d5e64c7bb5cdb862c1a8532b5f /backend | |
| parent | aead5019a7075a5823ae7e9255106e666e7b87de (diff) | |
| parent | 91d72040e588c500e8017c6ad824a96ed4180996 (diff) | |
Merge pull request #469 from emersion/output-config-by-name
Configure outputs with make, model, serial in rootston
Diffstat (limited to 'backend')
| -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]; |