mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Re-add support for wlr_output's atomic API

Browse source 
This reverts commit 724926ea6a and
re-applies commit 6e0565e9de.

Outputs now need to be explicitly enabled when performing a modeset.
We need to roll back wlr_output_attach_render when we decide not to
render.

See also: https://github.com/swaywm/wlroots/pull/1797 (wlroots PR)
See also: https://github.com/swaywm/sway/pull/4355 (Original sway PR)
See also: https://github.com/swaywm/sway/pull/4434 (Revert sway PR)
This commit is contained in:
Simon Ser 2019-12-27 11:47:51 +01:00 committed by Drew DeVault
parent 658b779662
commit ef2332f7a6
2 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
sway/config/output.c
View file

@ -231,14 +231,15 @@ struct output_config *store_output_config(struct output_config *oc) {
return oc; return oc;
} }
static bool set_mode(struct wlr_output *output, int width, int height, static void set_mode(struct wlr_output *output, int width, int height,
float refresh_rate, bool custom) { float refresh_rate, bool custom) {
int mhz = (int)(refresh_rate * 1000); int mhz = (int)(refresh_rate * 1000);
if (wl_list_empty(&output->modes) || custom) { if (wl_list_empty(&output->modes) || custom) {
sway_log(SWAY_DEBUG, "Assigning custom mode to %s", output->name); sway_log(SWAY_DEBUG, "Assigning custom mode to %s", output->name);
return wlr_output_set_custom_mode(output, width, height, wlr_output_set_custom_mode(output, width, height,
refresh_rate > 0 ? mhz : 0); refresh_rate > 0 ? mhz : 0);
return;
} }
struct wlr_output_mode *mode, *best = NULL; struct wlr_output_mode *mode, *best = NULL;
@ -260,7 +261,7 @@ static bool set_mode(struct wlr_output *output, int width, int height,
} else { } else {
sway_log(SWAY_DEBUG, "Assigning configured mode to %s", output->name); sway_log(SWAY_DEBUG, "Assigning configured mode to %s", output->name);
} }
return wlr_output_set_mode(output, best); wlr_output_set_mode(output, best);
} }
/* Some manufacturers hardcode the aspect-ratio of the output in the physical /* Some manufacturers hardcode the aspect-ratio of the output in the physical
@ -315,46 +316,38 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
if (oc && !oc->enabled) { if (oc && !oc->enabled) {
// Output is configured to be disabled // Output is configured to be disabled
sway_log(SWAY_DEBUG, "Disabling output %s", oc->name);
if (output->enabled) { if (output->enabled) {
output_disable(output); output_disable(output);
wlr_output_layout_remove(root->output_layout, wlr_output); wlr_output_layout_remove(root->output_layout, wlr_output);
} }
wlr_output_enable(wlr_output, false); wlr_output_enable(wlr_output, false);
return true; return wlr_output_commit(wlr_output);
} else if (!output->enabled) { } else if (!output->enabled) {
// Output is not enabled. Enable it, output_enable will call us again. // Output is not enabled. Enable it, output_enable will call us again.
if (!oc || oc->dpms_state != DPMS_OFF) { if (!oc || oc->dpms_state != DPMS_OFF) {
sway_log(SWAY_DEBUG, "Enabling output %s", oc->name);
wlr_output_enable(wlr_output, true); wlr_output_enable(wlr_output, true);
wlr_output_commit(wlr_output);
} }
return output_enable(output, oc); return output_enable(output, oc);
} }
if (oc && oc->dpms_state == DPMS_ON) { if (!oc || oc->dpms_state != DPMS_OFF) {
sway_log(SWAY_DEBUG, "Turning on screen"); sway_log(SWAY_DEBUG, "Turning on output %s", oc->name);
wlr_output_enable(wlr_output, true); wlr_output_enable(wlr_output, true);
}
bool modeset_success; if (oc && oc->width > 0 && oc->height > 0) {
if (oc && oc->width > 0 && oc->height > 0) { sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f Hz)", oc->name, oc->width,
sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f Hz)", oc->name, oc->width, oc->height, oc->refresh_rate);
oc->height, oc->refresh_rate); set_mode(wlr_output, oc->width, oc->height,
modeset_success = set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate, oc->custom_mode == 1);
oc->refresh_rate, oc->custom_mode == 1); } else if (!wl_list_empty(&wlr_output->modes)) {
} else if (!wl_list_empty(&wlr_output->modes)) { struct wlr_output_mode *mode = wlr_output_preferred_mode(wlr_output);
struct wlr_output_mode *mode = wlr_output_preferred_mode(wlr_output); wlr_output_set_mode(wlr_output, mode);
modeset_success = wlr_output_set_mode(wlr_output, mode); }
} else { output->current_mode = wlr_output->pending.mode;
// Output doesn't support modes
modeset_success = true;
} }
if (!modeset_success) {
// Failed to modeset, maybe the output is missing a CRTC. Leave the
// output disabled for now and try again when the output gets the mode
// we asked for.
sway_log(SWAY_ERROR, "Failed to modeset output %s", wlr_output->name);
return false;
}
output->current_mode = wlr_output->current_mode;
float scale; float scale;
if (oc && oc->scale > 0) { if (oc && oc->scale > 0) {
@ -400,6 +393,15 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
wlr_output_set_transform(wlr_output, oc->transform); wlr_output_set_transform(wlr_output, oc->transform);
} }
sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name);
if (!wlr_output_commit(wlr_output)) {
// Failed to modeset, maybe the output is missing a CRTC. Leave the
// output disabled for now and try again when the output gets the mode
// we asked for.
sway_log(SWAY_ERROR, "Failed to modeset output %s", wlr_output->name);
return false;
}
// Find position for it // Find position for it
if (oc && (oc->x != -1 || oc->y != -1)) { if (oc && (oc->x != -1 || oc->y != -1)) {
sway_log(SWAY_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y); sway_log(SWAY_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y);
@ -417,8 +419,9 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
output->height = output_box->height; output->height = output_box->height;
if (oc && oc->dpms_state == DPMS_OFF) { if (oc && oc->dpms_state == DPMS_OFF) {
sway_log(SWAY_DEBUG, "Turning off screen"); sway_log(SWAY_DEBUG, "Turning off output %s", oc->name);
wlr_output_enable(wlr_output, false); wlr_output_enable(wlr_output, false);
wlr_output_commit(wlr_output);
} }
if (oc && oc->max_render_time >= 0) { if (oc && oc->max_render_time >= 0) {

8
sway/desktop/output.c
View file

@ -560,8 +560,12 @@ int output_repaint_timer_handler(void *data) {
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
output_render(output, &now, &damage); output_render(output, &now, &damage);
} else if (surface_needs_frame) { } else {
wlr_output_schedule_frame(output->wlr_output); wlr_output_rollback(output->wlr_output);
if (surface_needs_frame) {
wlr_output_schedule_frame(output->wlr_output);
}
} }
pixman_region32_fini(&damage); pixman_region32_fini(&damage);