hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 03:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Initialize connectors current mode to the mode used by KMS on startup.

Browse source
This commit is contained in:
vanfanel 2022-09-11 18:38:53 +02:00 committed by Simon Ser
parent 1facdeabe5
commit 8795dde94e
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
backend/drm/drm.c
View file

@ -1341,6 +1341,24 @@ void scan_drm_connectors(struct wlr_drm_backend *drm,
free(subconnector); free(subconnector);
// Before iterating on the conn's modes, get the current KMS mode
// in use from the connector's CRTC.
drmModeModeInfo *current_modeinfo = NULL;
if (wlr_conn->crtc != NULL) {
if (wlr_conn->crtc->props.mode_id == 0) {
// Use the legacy drm interface.
if (wlr_conn->crtc->legacy_crtc->mode_valid) {
current_modeinfo = &wlr_conn->crtc->legacy_crtc->mode;
}
} else {
// Use the modern atomic drm interface.
size_t modeinfo_size = 0;
current_modeinfo = get_drm_prop_blob(drm->fd, wlr_conn->crtc->id,
wlr_conn->crtc->props.mode_id, &modeinfo_size);
assert(modeinfo_size == sizeof(drmModeModeInfo));
}
}
wlr_log(WLR_INFO, "Detected modes:"); wlr_log(WLR_INFO, "Detected modes:");
for (int i = 0; i < drm_conn->count_modes; ++i) { for (int i = 0; i < drm_conn->count_modes; ++i) {
@ -1363,6 +1381,21 @@ void scan_drm_connectors(struct wlr_drm_backend *drm,
mode->wlr_mode.preferred = true; mode->wlr_mode.preferred = true;
} }
// If this is the current mode set on the conn's crtc,
// then set it as the conn's output current mode.
if (current_modeinfo != NULL && memcmp(&mode->drm_mode,
current_modeinfo, sizeof(*current_modeinfo)) == 0) {
// Update width, height, refresh, transform_matrix and current_mode
// of this connector's output.
wlr_output_update_mode(&wlr_conn->output, &mode->wlr_mode);
uint64_t mode_id = 0;
get_drm_prop(drm->fd, wlr_conn->crtc->id,
wlr_conn->crtc->props.mode_id, &mode_id);
wlr_conn->crtc->mode_id = mode_id;
}
wlr_log(WLR_INFO, " %"PRId32"x%"PRId32"@%"PRId32" %s", wlr_log(WLR_INFO, " %"PRId32"x%"PRId32"@%"PRId32" %s",
mode->wlr_mode.width, mode->wlr_mode.height, mode->wlr_mode.width, mode->wlr_mode.height,
mode->wlr_mode.refresh, mode->wlr_mode.refresh,
@ -1371,6 +1404,12 @@ void scan_drm_connectors(struct wlr_drm_backend *drm,
wl_list_insert(wlr_conn->output.modes.prev, &mode->wlr_mode.link); wl_list_insert(wlr_conn->output.modes.prev, &mode->wlr_mode.link);
} }
if (wlr_conn->crtc != NULL && wlr_conn->crtc->props.mode_id != 0) {
// free() the modeinfo pointer, but only
// if not using the legacy API.
free(current_modeinfo);
}
wlr_conn->possible_crtcs = wlr_conn->possible_crtcs =
drmModeConnectorGetPossibleCrtcs(drm->fd, drm_conn); drmModeConnectorGetPossibleCrtcs(drm->fd, drm_conn);
if (wlr_conn->possible_crtcs == 0) { if (wlr_conn->possible_crtcs == 0) {