Merge branch '0.19' into '0.19'

Revert removal of automatic drm reset on VT switch

See merge request wlroots/wlroots!5127
This commit is contained in:
Johan Malm 2026-03-20 12:26:11 +00:00
commit 56c4e0dc59
7 changed files with 148 additions and 8 deletions

View file

@ -225,6 +225,7 @@ void scan_drm_connectors(struct wlr_drm_backend *state,
void scan_drm_leases(struct wlr_drm_backend *drm);
bool commit_drm_device(struct wlr_drm_backend *drm,
const struct wlr_backend_output_state *states, size_t states_len, bool test_only);
void restore_drm_device(struct wlr_drm_backend *drm);
int handle_drm_event(int fd, uint32_t mask, void *data);
void destroy_drm_connector(struct wlr_drm_connector *conn);
bool drm_connector_is_cursor_visible(struct wlr_drm_connector *conn);

View file

@ -22,6 +22,8 @@ struct wlr_drm_interface {
bool (*commit)(struct wlr_drm_backend *drm,
const struct wlr_drm_device_state *state,
struct wlr_drm_page_flip *page_flip, uint32_t flags, bool test_only);
// Turn off everything
bool (*reset)(struct wlr_drm_backend *drm);
};
extern const struct wlr_drm_interface atomic_iface;