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

backend/drm: fix pending page-flip check

Browse source 
This chunk of code was moved by mistake.

Fixes: 3b53d1cbf1 ("backend/drm: introduce page-flip tracking struct")
This commit is contained in:
Simon Ser 2023-11-19 15:14:22 +01:00
parent c6b498528c
commit f47b6e3fce
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
backend/drm/drm.c
View file

@ -763,6 +763,16 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
if (!drm_connector_state_update_primary_fb(conn, &pending)) { if (!drm_connector_state_update_primary_fb(conn, &pending)) {
goto out; goto out;
} }
// wlr_drm_interface.crtc_commit will perform either a non-blocking
// page-flip, either a blocking modeset. When performing a blocking modeset
// we'll wait for all queued page-flips to complete, so we don't need this
// safeguard.
if (conn->pending_page_flip != NULL && !pending.modeset) {
wlr_drm_conn_log(conn, WLR_ERROR, "Failed to page-flip output: "
"a page-flip is already pending");
goto out;
}
} }
if (pending.base->committed & WLR_OUTPUT_STATE_LAYERS) { if (pending.base->committed & WLR_OUTPUT_STATE_LAYERS) {
if (!drm_connector_set_pending_layer_fbs(conn, pending.base)) { if (!drm_connector_set_pending_layer_fbs(conn, pending.base)) {
@ -783,15 +793,6 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
uint32_t flags = 0; uint32_t flags = 0;
if (pending.active) { if (pending.active) {
flags |= DRM_MODE_PAGE_FLIP_EVENT; 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
// we'll wait for all queued page-flips to complete, so we don't need this
// safeguard.
if (conn->pending_page_flip != NULL && !pending.modeset) {
wlr_drm_conn_log(conn, WLR_ERROR, "Failed to page-flip output: "
"a page-flip is already pending");
goto out;
}
} }
if (pending.base->tearing_page_flip) { if (pending.base->tearing_page_flip) {
flags |= DRM_MODE_PAGE_FLIP_ASYNC; flags |= DRM_MODE_PAGE_FLIP_ASYNC;