blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: always perform a test commit in drm_connector_test 

This allows callers to use wlr_output_test to check whether a mode
can be enabled, for instance.

Closes: https://github.com/swaywm/wlroots/issues/2250
This commit is contained in:
Simon Ser 2021-04-06 22:07:00 +02:00 committed by Kenny Levinsen
parent eb0ce659cf
commit 604674dc54
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/drm/drm.c
View File

@ -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 (!drm_connector_set_pending_fb(conn, &output->pending)) {
return false;
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 (!drm_crtc_commit(conn, &output->pending, 0, true)) {
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
if (!drm_connector_set_pending_fb(conn, &output->pending)) {
return false;
}
}
return true;
return drm_crtc_commit(conn, &output->pending, 0, true);
}
bool drm_connector_supports_vrr(struct wlr_drm_connector *conn) {