mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-16 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/drm: remove wlr_drm_crtc.pending_modeset

Browse source 
Replace it with a new drm_connector_state_is_modeset function that
decides whether a modeset is necessary directly from the
wlr_output_state which is going to be applied.
This commit is contained in:
Simon Ser 2021-04-06 17:06:37 +02:00 • committed by Kenny Levinsen
parent c9c2d7539c
commit 485ecc11a6
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/drm/atomic.c
View file

@ -169,8 +169,10 @@ static bool atomic_crtc_commit(struct wlr_drm_backend *drm,
struct wlr_output *output = &conn->output;
struct wlr_drm_crtc *crtc = conn->crtc;
bool modeset = drm_connector_state_is_modeset(state);
uint32_t mode_id = crtc->mode_id;
if (crtc->pending_modeset) {
if (modeset) {
if (!create_mode_blob(drm, crtc, &mode_id)) {
return false;
}
@ -203,7 +205,7 @@ static bool atomic_crtc_commit(struct wlr_drm_backend *drm,
vrr_enabled = state->adaptive_sync_enabled;
}
if (crtc->pending_modeset) {
if (modeset) {
flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
} else if (!(flags & DRM_MODE_ATOMIC_TEST_ONLY)) {
flags |= DRM_MODE_ATOMIC_NONBLOCK;
@ -213,7 +215,7 @@ static bool atomic_crtc_commit(struct wlr_drm_backend *drm,
atomic_begin(&atom);
atomic_add(&atom, conn->id, conn->props.crtc_id,
crtc->pending.active ? crtc->id : 0);
if (crtc->pending_modeset && crtc->pending.active &&
if (modeset && crtc->pending.active &&
conn->props.link_status != 0) {
atomic_add(&atom, conn->id, conn->props.link_status,
DRM_MODE_LINK_STATUS_GOOD);