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

prevent current_mode null on output_enable(false) 

The current mode was set to NULL to abuse it as state variable
persisting DRM suspend/resume, this results resulted in a segfault on
normal DPMS cycle.

This reverts that change and uses the wlr_output enabled variable, which
also persists and makes more sense.
This commit is contained in:
Markus Ongyerth 2018-03-01 15:48:25 +01:00
parent 73045a7d9d
commit 2cea430488
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/backend.c
View File

@ -81,7 +81,7 @@ static void session_signal(struct wl_listener *listener, void *data) {
struct wlr_drm_connector *conn;
wl_list_for_each(conn, &drm->outputs, link){
if (conn->output.current_mode) {
if (conn->output.enabled) {
wlr_output_set_mode(&conn->output, conn->output.current_mode);
} else {
wlr_drm_connector_enable(&conn->output, false);

2
backend/drm/drm.c
View File

@ -296,8 +296,6 @@ void wlr_drm_connector_enable(struct wlr_output *output, bool enable) {
if (enable) {
wlr_drm_connector_start_renderer(conn);
} else {
output->current_mode = NULL;
}
wlr_output_update_enabled(&conn->output, enable);