aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2019-12-27 11:59:15 +0100
committerDrew DeVault <sir@cmpwn.com>2019-12-30 11:21:11 -0700
commit8fc16890c713990ca6dbe89b34e70c78564b4a0f (patch)
treed03ebd901e52e93f3be421e3f3475da6d3012c30 /backend
parentb5597f5b4471a96254e21bbd1956b248afdd4a48 (diff)
output: refuse to commit a buffer or modeset a disabled output
References: https://github.com/swaywm/wlroots/issues/1780#issuecomment-518938390
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/drm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index dea79d7a..e6b99bee 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -446,7 +446,9 @@ static bool drm_connector_commit(struct wlr_output *output) {
}
}
- if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
+ // TODO: support modesetting with a buffer
+ if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER &&
+ !(output->pending.committed & WLR_OUTPUT_STATE_MODE)) {
if (!drm_connector_commit_buffer(output)) {
return false;
}