aboutsummaryrefslogtreecommitdiff
path: root/backend/drm
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2023-08-14 19:39:33 +0200
committerAlexander Orzechowski <alex@ozal.ski>2023-08-23 15:42:22 +0000
commite5fc8cd4c734717c471567de98a77e2482a7015f (patch)
tree6f7e10a98dac1f207066a96e75e8a7d3fb95c948 /backend/drm
parent462f04db9e70c683a421aa015c1689fff8206781 (diff)
output: trigger frame/present events on all commits on enabled output
Up until now, frame/present events were only triggered when the user submitted a buffer. Change the wlr_output API so that these events are triggered when any commit is applied on an enabled output. Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3708
Diffstat (limited to 'backend/drm')
-rw-r--r--backend/drm/drm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 85240448..a012e678 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -715,12 +715,10 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
}
}
- uint32_t flags = 0;
if (pending.base->committed & WLR_OUTPUT_STATE_BUFFER) {
if (!drm_connector_state_update_primary_fb(conn, &pending)) {
goto out;
}
- flags |= DRM_MODE_PAGE_FLIP_EVENT;
// wlr_drm_interface.crtc_commit will perform either a non-blocking
// page-flip, either a blocking modeset. When performing a blocking modeset
@@ -732,9 +730,6 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
goto out;
}
}
- if (pending.modeset && pending.active) {
- flags |= DRM_MODE_PAGE_FLIP_EVENT;
- }
if (pending.base->committed & WLR_OUTPUT_STATE_LAYERS) {
if (!drm_connector_set_pending_layer_fbs(conn, pending.base)) {
return false;
@@ -751,6 +746,8 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
}
}
+ uint32_t flags = pending.active ? DRM_MODE_PAGE_FLIP_EVENT : 0;
+
ok = drm_crtc_commit(conn, &pending, flags, false);
if (!ok) {
goto out;