hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backend/drm: move post-commit disable logic to drm_connector_apply_commit() 

After disabling a connector, we need to cleanup the connector to
teardown the surfaces and unlock the FBs.

Move this logic into drm_connector_apply_commit() so that it's
applied when drm_commit() is called from somewhere else than
drm_connector_commit_state().
This commit is contained in:
Simon Ser 2024-02-16 15:29:47 +01:00 committed by Kenny Levinsen
parent 5efa88ee7a
commit a4f54086c1
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/drm/drm.c
View File

@ -512,6 +512,15 @@ static void drm_connector_apply_commit(const struct wlr_drm_connector_state *sta
if (state->base->committed & WLR_OUTPUT_STATE_MODE) {
conn->refresh = calculate_refresh_rate(&state->mode);
}
if (!state->active) {
drm_plane_finish_surface(crtc->primary);
drm_plane_finish_surface(crtc->cursor);
drm_fb_clear(&conn->cursor_pending_fb);
conn->cursor_enabled = false;
conn->crtc = NULL;
}
}
static void drm_connector_rollback_commit(const struct wlr_drm_connector_state *state) {
@ -855,18 +864,6 @@ static bool drm_connector_commit_state(struct wlr_drm_connector *conn,
}
ok = drm_commit(drm, &pending_dev, flags, test_only);
if (!ok) {
goto out;
}
if (!test_only && !pending.active) {
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;
}
out:
drm_connector_state_finish(&pending);