output: Replace wlr_output_adaptive_sync_status with bool

This commit is contained in:
Alexander Orzechowski 2023-06-20 22:54:40 -04:00
parent 28b03c3220
commit 6d8f3babe4
8 changed files with 15 additions and 32 deletions

View file

@ -302,8 +302,7 @@ static bool atomic_crtc_commit(struct wlr_drm_connector *conn,
&state->base->damage, &fb_damage_clips);
}
bool prev_vrr_enabled =
output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED;
bool prev_vrr_enabled = output->adaptive_sync_enabled;
bool vrr_enabled = prev_vrr_enabled;
if ((state->base->committed & WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED)) {
if (!drm_connector_supports_vrr(conn)) {
@ -378,9 +377,7 @@ static bool atomic_crtc_commit(struct wlr_drm_connector *conn,
commit_blob(drm, &crtc->gamma_lut, gamma_lut);
if (vrr_enabled != prev_vrr_enabled) {
output->adaptive_sync_status = vrr_enabled ?
WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED :
WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED;
output->adaptive_sync_enabled = vrr_enabled;
wlr_drm_conn_log(conn, WLR_DEBUG, "VRR %s",
vrr_enabled ? "enabled" : "disabled");
}

View file

@ -125,9 +125,7 @@ static bool legacy_crtc_commit(struct wlr_drm_connector *conn,
"drmModeObjectSetProperty(VRR_ENABLED) failed");
return false;
}
output->adaptive_sync_status = state->base->adaptive_sync_enabled ?
WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED :
WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED;
output->adaptive_sync_enabled = state->base->adaptive_sync_enabled;
wlr_drm_conn_log(conn, WLR_DEBUG, "VRR %s",
state->base->adaptive_sync_enabled ? "enabled" : "disabled");
}

View file

@ -329,8 +329,7 @@ static bool crtc_commit(struct wlr_drm_connector *conn,
&state->base->damage, &fb_damage_clips);
}
bool prev_vrr_enabled =
output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED;
bool prev_vrr_enabled = output->adaptive_sync_enabled;
bool vrr_enabled = prev_vrr_enabled;
if ((state->base->committed & WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED) &&
drm_connector_supports_vrr(conn)) {
@ -456,9 +455,7 @@ out:
commit_blob(drm, &crtc->gamma_lut, gamma_lut);
if (vrr_enabled != prev_vrr_enabled) {
output->adaptive_sync_status = vrr_enabled ?
WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED :
WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED;
output->adaptive_sync_enabled = vrr_enabled;
wlr_drm_conn_log(conn, WLR_DEBUG, "VRR %s",
vrr_enabled ? "enabled" : "disabled");
}