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

backend/drm: use early return in handle_session_active()

Browse source
This commit is contained in:
Simon Ser 2024-02-14 16:37:30 +01:00
parent 9a685cefa9
commit c397515ee5
1 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
backend/drm/backend.c
View file

@ -100,47 +100,48 @@ static void handle_session_active(struct wl_listener *listener, void *data) {
wl_container_of(listener, drm, session_active); wl_container_of(listener, drm, session_active);
struct wlr_session *session = drm->session; struct wlr_session *session = drm->session;
if (session->active) { wlr_log(WLR_INFO, "DRM FD %s", session->active ? "resumed" : "paused");
wlr_log(WLR_INFO, "DRM fd resumed");
scan_drm_connectors(drm, NULL);
// The previous DRM master leaves KMS in an undefined state. We need if (!session->active) {
// to restore out own state, but be careful to avoid invalid return;
// configurations. The connector/CRTC mapping may have changed, so }
// first disable all CRTCs, then light up the ones we were using
// before the VT switch.
// TODO: use the atomic API to improve restoration after a VT switch
for (size_t i = 0; i < drm->num_crtcs; i++) {
struct wlr_drm_crtc *crtc = &drm->crtcs[i];
if (drmModeSetCrtc(drm->fd, crtc->id, 0, 0, 0, NULL, 0, NULL) != 0) { scan_drm_connectors(drm, NULL);
wlr_log_errno(WLR_ERROR, "Failed to disable CRTC %"PRIu32" after VT switch",
crtc->id); // The previous DRM master leaves KMS in an undefined state. We need
// to restore out own state, but be careful to avoid invalid
// configurations. The connector/CRTC mapping may have changed, so
// first disable all CRTCs, then light up the ones we were using
// before the VT switch.
// TODO: use the atomic API to improve restoration after a VT switch
for (size_t i = 0; i < drm->num_crtcs; i++) {
struct wlr_drm_crtc *crtc = &drm->crtcs[i];
if (drmModeSetCrtc(drm->fd, crtc->id, 0, 0, 0, NULL, 0, NULL) != 0) {
wlr_log_errno(WLR_ERROR, "Failed to disable CRTC %"PRIu32" after VT switch",
crtc->id);
}
}
struct wlr_drm_connector *conn;
wl_list_for_each(conn, &drm->connectors, link) {
bool enabled = conn->status != DRM_MODE_DISCONNECTED && conn->output.enabled;
struct wlr_output_state state;
wlr_output_state_init(&state);
wlr_output_state_set_enabled(&state, enabled);
if (enabled) {
if (conn->output.current_mode != NULL) {
wlr_output_state_set_mode(&state, conn->output.current_mode);
} else {
wlr_output_state_set_custom_mode(&state,
conn->output.width, conn->output.height, conn->output.refresh);
} }
} }
if (!drm_connector_commit_state(conn, &state)) {
struct wlr_drm_connector *conn; wlr_drm_conn_log(conn, WLR_ERROR, "Failed to restore state after VT switch");
wl_list_for_each(conn, &drm->connectors, link) {
bool enabled = conn->status != DRM_MODE_DISCONNECTED && conn->output.enabled;
struct wlr_output_state state;
wlr_output_state_init(&state);
wlr_output_state_set_enabled(&state, enabled);
if (enabled) {
if (conn->output.current_mode != NULL) {
wlr_output_state_set_mode(&state, conn->output.current_mode);
} else {
wlr_output_state_set_custom_mode(&state,
conn->output.width, conn->output.height, conn->output.refresh);
}
}
if (!drm_connector_commit_state(conn, &state)) {
wlr_drm_conn_log(conn, WLR_ERROR, "Failed to restore state after VT switch");
}
wlr_output_state_finish(&state);
} }
} else { wlr_output_state_finish(&state);
wlr_log(WLR_INFO, "DRM fd paused");
} }
} }