Better handle outputs without CRTC

This happens if you plug in more outputs than supported by your GPU.

This patch makes it so outputs without CRTCs appear as disabled. As soon as
they get a CRTC (signalled via the mode event), we can enable them.
This commit is contained in:
emersion 2019-01-17 22:30:24 +01:00
parent dc1eac0cf1
commit a737d7ecc4
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
5 changed files with 47 additions and 15 deletions

View file

@ -503,7 +503,18 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
static void handle_mode(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, mode);
if (!output->configured) {
return;
}
if (!output->enabled) {
struct output_config *oc = output_find_config(output);
if (output->wlr_output->current_mode != NULL &&
(!oc || oc->enabled)) {
// We want to enable this output, but it didn't work last time,
// possibly because we hadn't enough CRTCs. Try again now that the
// output has a mode.
output_enable(output, oc);
}
return;
}
arrange_layers(output);
@ -592,7 +603,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->damage_destroy.notify = damage_handle_destroy;
struct output_config *oc = output_find_config(output);
if (!oc || oc->enabled) {
output_enable(output, oc);
} else {