blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: don't modeset with a NULL mode after TTY switch 

This fixes a segfault in drm_connector_set_mode (mode = NULL).

This happens because we set wlr_output.enabled to true if the connector
is attached to the CRTC. When the user disables an output in the
wlroots-based compositor, switches to another VT (enabling the output),
then switches back, wlroots sets wlr_output.enabled to true but
wlr_output.current_mode is NULL.

We should consider not reading properties from KMS after a TTY switch,
disabling all connectors. However this may result in flickering (outputs
being disabled then re-enabled).

Closes: https://github.com/swaywm/wlroots/issues/1874
This commit is contained in:
Simon Ser 2019-12-29 10:55:16 +01:00 committed by Drew DeVault
parent ff29843d87
commit 21e1953b61
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/backend.c
View File

@ -93,7 +93,7 @@ static void session_signal(struct wl_listener *listener, void *data) {
struct wlr_drm_connector *conn; struct wlr_drm_connector *conn;
wl_list_for_each(conn, &drm->outputs, link){ wl_list_for_each(conn, &drm->outputs, link){
if (conn->output.enabled) { if (conn->output.enabled && conn->output.current_mode != NULL) {
drm_connector_set_mode(&conn->output, drm_connector_set_mode(&conn->output,
conn->output.current_mode); conn->output.current_mode);
} else { } else {

2
backend/drm/drm.c
View File

@ -1439,6 +1439,8 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
wlr_conn->output.name); wlr_conn->output.name);
} }
// TODO: this results in connectors being enabled without a mode
// set
wlr_output_update_enabled(&wlr_conn->output, wlr_conn->crtc != NULL); wlr_output_update_enabled(&wlr_conn->output, wlr_conn->crtc != NULL);
wlr_conn->desired_enabled = true; wlr_conn->desired_enabled = true;