Skip to content

Commit

Permalink
backend/drm: always perform a test commit in drm_connector_test
Browse files Browse the repository at this point in the history
This allows callers to use wlr_output_test to check whether a mode
can be enabled, for instance.

Closes: swaywm#2250
  • Loading branch information
emersion authored and kennylevinsen committed Aug 10, 2021
1 parent eb0ce65 commit 604674d
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions backend/drm/drm.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,16 +473,19 @@ static bool drm_connector_test(struct wlr_output *output) {
}
}

if ((output->pending.committed & WLR_OUTPUT_STATE_BUFFER) && !conn->backend->parent) {
if (conn->backend->parent) {
// If we're running as a secondary GPU, we can't perform an atomic
// commit without blitting a buffer.
return true;
}

if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
if (!drm_connector_set_pending_fb(conn, &output->pending)) {
return false;
}
if (!drm_crtc_commit(conn, &output->pending, 0, true)) {
return false;
}
}

return true;
return drm_crtc_commit(conn, &output->pending, 0, true);
}

bool drm_connector_supports_vrr(struct wlr_drm_connector *conn) {
Expand Down

0 comments on commit 604674d

Please sign in to comment.