diff options
author | emersion <contact@emersion.fr> | 2018-09-10 23:35:22 +0200 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-09-15 08:37:33 +0200 |
commit | f8a50e4fe75ac01a86c94bfedf6cfbaf07c391b2 (patch) | |
tree | 753d2bff7a91a0fcf4fc3f3a9796b34d8b983979 /include/backend | |
parent | df991a55ab23017d4c5d90d344d472e904dc682f (diff) |
backend/drm: steal CRTCs from disabled outputs
This commit allows outputs that need a CRTC to steal it from
user-disabled outputs. Note that in the case there are enough
CRTCs, disabled outputs don't loose it (so there's no modeset
and plane initialization needed after DPMS). CRTC allocation
still prefers to keep the old configuration, even if that means
allocating an extra CRTC to a disabled output.
CRTC reallocation now happen when enabling/disabling an output as
well as when trying to modeset. When enabling an output without a
CRTC, we realloc to try to steal a CRTC from a disabled output
(that doesn't really need the CRTC). When disabling an output, we
try to give our CRTC to an output that needs one. Modesetting is
similar to enabling.
A new DRM connector field has been added: `desired_enabled`.
Outputs without CRTCs get automatically disabled. This field keeps
track of the state desired by the user, allowing to automatically
re-enable outputs when a CRTC becomes free.
This required some changes to the allocation algorithm. Previously,
the algorithm tried to keep the previous configuration even if a
new configuration with a better score was possible (it only changed
configuration when the old one didn't work anymore). This is now
changed and the old configuration (still preferred) is only
retained without considering new possibilities when it's perfect
(all outputs have CRTCs).
User-disabled outputs now have `possible_crtcs` set to 0, meaning
they can only retain a previous CRTC (not acquire a new one). The
allocation algorithm has been updated to do not bump the score
when assigning a CRTC to a disabled output.
Diffstat (limited to 'include/backend')
-rw-r--r-- | include/backend/drm/drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 25225227..6fe031e2 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -120,6 +120,7 @@ struct wlr_drm_connector { enum wlr_drm_connector_state state; struct wlr_output_mode *desired_mode; + bool desired_enabled; uint32_t id; struct wlr_drm_crtc *crtc; |