diff options
| author | emersion <contact@emersion.fr> | 2017-12-14 20:31:18 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-12-14 20:31:18 +0100 |
| commit | 466e86b7b2cbefa55ad5b85a97ee8257c24cb81b (patch) | |
| tree | cc1691ec5abefdffcb8ac6312574ffa03bc4049a /backend/drm | |
| parent | eb763439f75d3c9174280d0c75ef44941dd99340 (diff) | |
| parent | a9fb071d49b244b72846b384a9e2ef2d9b03a05f (diff) | |
Merge branch 'master' into surface-transform
Diffstat (limited to 'backend/drm')
| -rw-r--r-- | backend/drm/drm.c | 12 | ||||
| -rw-r--r-- | backend/drm/util.c | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index cf6ad550..96b7d93d 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -453,11 +453,7 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output, conn->state = WLR_DRM_CONN_CONNECTED; conn->output.current_mode = mode; - if (conn->output.width != mode->width || conn->output.height != mode->height) { - conn->output.width = mode->width; - conn->output.height = mode->height; - wl_signal_emit(&conn->output.events.resolution, &conn->output); - } + wlr_output_update_size(&conn->output, mode->width, mode->height); // Since realloc_crtcs can deallocate planes on OTHER outputs, // we actually need to reinitalise any than has changed @@ -633,8 +629,10 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output, struct wlr_box transformed_box; wlr_box_transform(&box, transform, &transformed_box); - transformed_box.x -= plane->cursor_hotspot_x; - transformed_box.y -= plane->cursor_hotspot_y; + if (plane != NULL) { + transformed_box.x -= plane->cursor_hotspot_x; + transformed_box.y -= plane->cursor_hotspot_y; + } return drm->iface->crtc_move_cursor(drm, conn->crtc, transformed_box.x, transformed_box.y); 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]; |