|
|
@ -721,32 +721,6 @@ static bool drm_connector_set_pending_layer_fbs(struct wlr_drm_connector *conn,
|
|
|
|
|
|
|
|
|
|
|
|
static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn);
|
|
|
|
static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn);
|
|
|
|
|
|
|
|
|
|
|
|
bool drm_connector_supports_vrr(struct wlr_drm_connector *conn) {
|
|
|
|
|
|
|
|
struct wlr_drm_backend *drm = conn->backend;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct wlr_drm_crtc *crtc = conn->crtc;
|
|
|
|
|
|
|
|
if (!crtc) {
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uint64_t vrr_capable;
|
|
|
|
|
|
|
|
if (conn->props.vrr_capable == 0 ||
|
|
|
|
|
|
|
|
!get_drm_prop(drm->fd, conn->id, conn->props.vrr_capable,
|
|
|
|
|
|
|
|
&vrr_capable) || !vrr_capable) {
|
|
|
|
|
|
|
|
wlr_drm_conn_log(conn, WLR_DEBUG, "Failed to enable adaptive sync: "
|
|
|
|
|
|
|
|
"connector doesn't support VRR");
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (crtc->props.vrr_enabled == 0) {
|
|
|
|
|
|
|
|
wlr_drm_conn_log(conn, WLR_DEBUG, "Failed to enable adaptive sync: "
|
|
|
|
|
|
|
|
"CRTC %"PRIu32" doesn't support VRR", crtc->id);
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static bool drm_connector_prepare(struct wlr_drm_connector_state *conn_state, bool test_only) {
|
|
|
|
static bool drm_connector_prepare(struct wlr_drm_connector_state *conn_state, bool test_only) {
|
|
|
|
const struct wlr_output_state *state = conn_state->base;
|
|
|
|
const struct wlr_output_state *state = conn_state->base;
|
|
|
|
struct wlr_drm_connector *conn = conn_state->connector;
|
|
|
|
struct wlr_drm_connector *conn = conn_state->connector;
|
|
|
@ -770,7 +744,9 @@ static bool drm_connector_prepare(struct wlr_drm_connector_state *conn_state, bo
|
|
|
|
|
|
|
|
|
|
|
|
if ((state->committed & WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED) &&
|
|
|
|
if ((state->committed & WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED) &&
|
|
|
|
state->adaptive_sync_enabled &&
|
|
|
|
state->adaptive_sync_enabled &&
|
|
|
|
!drm_connector_supports_vrr(conn)) {
|
|
|
|
!output->adaptive_sync_supported) {
|
|
|
|
|
|
|
|
wlr_drm_conn_log(conn, WLR_DEBUG,
|
|
|
|
|
|
|
|
"Can't enable adaptive sync: connector doesn't support VRR");
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|