mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-13 08:22:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into 'master'

Browse source 
backend/drm: ensure connector gets the correct CRTC after session activation

See merge request wlroots/wlroots!4948
This commit is contained in:
sunzhguy 2026-03-07 19:26:54 +00:00
commit 4f5ed346ab
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backend/drm/drm.c
View file

@ -1363,6 +1363,12 @@ static void dealloc_crtc(struct wlr_drm_connector *conn) {
// On GPU unplug, disabling the CRTC can fail with EPERM
wlr_drm_conn_log(conn, WLR_ERROR, "Failed to disable CRTC %"PRIu32,
conn->crtc->id);
drm_plane_finish_surface(conn->crtc->primary);
drm_plane_finish_surface(conn->crtc->cursor);
drm_fb_clear(&conn->cursor_pending_fb);
conn->cursor_enabled = false;
conn->crtc = NULL;
}
wlr_output_state_finish(&state);
}
@ -1608,6 +1614,9 @@ static bool connect_drm_connector(struct wlr_drm_connector *wlr_conn,
struct wlr_drm_backend *drm = wlr_conn->backend;
struct wlr_output *output = &wlr_conn->output;
if (wlr_conn->crtc == NULL) {
wlr_conn->crtc = connector_get_current_crtc(wlr_conn, drm_conn);
}
wlr_log(WLR_DEBUG, "Current CRTC: %d",
wlr_conn->crtc ? (int)wlr_conn->crtc->id : -1);