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: update wlr_drm_connnector.crtc in drm_connector_commit_state() 

If the commit fails, then our local state becomes out-of-sync with
the kernel's. Additionally, when disabling a connector without going
through dealloc_crtc(), conn->crtc would still be set.

Fix this by updating conn->crtc in drm_connector_commit_state().
This commit is contained in:
Simon Ser 2022-12-13 12:34:46 +01:00 committed by Simon Zeni
parent e59c3602f7
commit ea14e9c95f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/drm/drm.c
View File

@ -620,6 +620,13 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
goto out; goto out;
} }
if (!pending.active) {
drm_plane_finish_surface(conn->crtc->primary);
drm_plane_finish_surface(conn->crtc->cursor);
conn->cursor_enabled = false;
conn->crtc = NULL;
}
if (pending.base->committed & WLR_OUTPUT_STATE_MODE) { if (pending.base->committed & WLR_OUTPUT_STATE_MODE) {
struct wlr_output_mode *mode = NULL; struct wlr_output_mode *mode = NULL;
switch (pending.base->mode_type) { switch (pending.base->mode_type) {
@ -999,13 +1006,12 @@ static const int32_t subpixel_map[] = {
}; };
static void dealloc_crtc(struct wlr_drm_connector *conn) { static void dealloc_crtc(struct wlr_drm_connector *conn) {
struct wlr_drm_backend *drm = conn->backend;
if (conn->crtc == NULL) { if (conn->crtc == NULL) {
return; return;
} }
wlr_drm_conn_log(conn, WLR_DEBUG, "De-allocating CRTC %zu", wlr_drm_conn_log(conn, WLR_DEBUG, "De-allocating CRTC %" PRIu32,
conn->crtc - drm->crtcs); conn->crtc->id);
struct wlr_output_state state = { struct wlr_output_state state = {
.committed = WLR_OUTPUT_STATE_ENABLED, .committed = WLR_OUTPUT_STATE_ENABLED,
@ -1017,12 +1023,6 @@ static void dealloc_crtc(struct wlr_drm_connector *conn) {
wlr_drm_conn_log(conn, WLR_ERROR, "Failed to disable CRTC %"PRIu32, wlr_drm_conn_log(conn, WLR_ERROR, "Failed to disable CRTC %"PRIu32,
conn->crtc->id); conn->crtc->id);
} }
drm_plane_finish_surface(conn->crtc->primary);
drm_plane_finish_surface(conn->crtc->cursor);
conn->cursor_enabled = false;
conn->crtc = NULL;
} }
static void realloc_crtcs(struct wlr_drm_backend *drm, static void realloc_crtcs(struct wlr_drm_backend *drm,