diff options
| author | Simon Ser <contact@emersion.fr> | 2021-06-18 12:40:07 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-08-30 17:53:50 +0000 |
| commit | 8c70245d5fe044f09882653437e0a9dc7c336a0c (patch) | |
| tree | 3e82af4e461fd5370a145a42e00a4aab4ebcbe4a /backend/drm/drm.c | |
| parent | 26e1812ab3eb75ba5c13f1a4060dd74fb4c93263 (diff) | |
output: fail commits if adaptive sync cannot be enabled
Previously, adaptive sync was just a hint and wouldn't make any
atomic commit fail if the backend didn't support it. The main reason
is wlr_output_test wasn't supported at the time.
Now that we have a way for compositors to test whether a change can
work, let's remove the exception for adaptive sync and convert it to
a regular output state field.
Diffstat (limited to 'backend/drm/drm.c')
| -rw-r--r-- | backend/drm/drm.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 94dd7023..06548ed0 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -36,7 +36,8 @@ static const uint32_t COMMIT_OUTPUT_STATE = WLR_OUTPUT_STATE_BUFFER | WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_ENABLED | - WLR_OUTPUT_STATE_GAMMA_LUT; + WLR_OUTPUT_STATE_GAMMA_LUT | + WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED; static const uint32_t SUPPORTED_OUTPUT_STATE = WLR_OUTPUT_STATE_BACKEND_OPTIONAL | COMMIT_OUTPUT_STATE; @@ -489,6 +490,12 @@ static bool drm_connector_test(struct wlr_output *output, } } + if ((state->committed & WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED) && + state->adaptive_sync_enabled && + !drm_connector_supports_vrr(conn)) { + return false; + } + struct wlr_drm_connector_state pending = {0}; drm_connector_state_init(&pending, conn, state); |