Skip to content

Commit

Permalink
Revert "Add support for wlr_output's atomic API"
Browse files Browse the repository at this point in the history 
This reverts commit 6e0565e.

This is required for the revert on swaywm/wlroots#1781
  • Loading branch information
@Emantor @ddevault
Emantor authored and ddevault committed Aug 7, 2019
1 parent dc5d76c commit 724926e
Showing 1 changed file with 27 additions and 26 deletions.
53 changes: 27 additions & 26 deletions sway/config/output.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,12 @@ struct output_config *store_output_config(struct output_config *oc) {
return oc;
}

static void set_mode(struct wlr_output *output, int width, int height,
static bool set_mode(struct wlr_output *output, int width, int height,
float refresh_rate) {
int mhz = (int)(refresh_rate * 1000);
if (wl_list_empty(&output->modes)) {
sway_log(SWAY_DEBUG, "Assigning custom mode to %s", output->name);
wlr_output_set_custom_mode(output, width, height, mhz);
return;
return wlr_output_set_custom_mode(output, width, height, mhz);
}

struct wlr_output_mode *mode, *best = NULL;
Expand All @@ -227,7 +226,7 @@ static void set_mode(struct wlr_output *output, int width, int height,
} else {
sway_log(SWAY_DEBUG, "Assigning configured mode to %s", output->name);
}
wlr_output_set_mode(output, best);
return wlr_output_set_mode(output, best);
}

bool apply_output_config(struct output_config *oc, struct sway_output *output) {
Expand All @@ -244,12 +243,11 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
wlr_output_layout_remove(root->output_layout, wlr_output);
}
wlr_output_enable(wlr_output, false);
return wlr_output_commit(wlr_output);
return true;
} else if (!output->enabled) {
// Output is not enabled. Enable it, output_enable will call us again.
if (!oc || oc->dpms_state != DPMS_OFF) {
wlr_output_enable(wlr_output, true);
wlr_output_commit(wlr_output);
}
output_enable(output, oc);
return true;
Expand All @@ -260,14 +258,26 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
wlr_output_enable(wlr_output, true);
}

struct wlr_output_mode *preferred_mode =
wlr_output_preferred_mode(wlr_output);
bool modeset_success;
if (oc && oc->width > 0 && oc->height > 0) {
sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width,
oc->height, oc->refresh_rate);
set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
} else if (preferred_mode != NULL) {
wlr_output_set_mode(wlr_output, preferred_mode);
modeset_success =
set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
} else if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode =
wl_container_of(wlr_output->modes.prev, mode, link);
modeset_success = wlr_output_set_mode(wlr_output, mode);
} else {
// 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;
}

if (oc && oc->scale > 0) {
Expand All @@ -287,14 +297,6 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
wlr_output_set_transform(wlr_output, oc->transform);
}

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
if (oc && (oc->x != -1 || oc->y != -1)) {
sway_log(SWAY_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y);
Expand All @@ -314,7 +316,6 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
if (oc && oc->dpms_state == DPMS_OFF) {
sway_log(SWAY_DEBUG, "Turning off screen");
wlr_output_enable(wlr_output, false);
wlr_output_commit(wlr_output);
}

return true;
Expand All @@ -323,12 +324,12 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
static void default_output_config(struct output_config *oc,
struct wlr_output *wlr_output) {
oc->enabled = 1;
struct wlr_output_mode *preferred_mode =
wlr_output_preferred_mode(wlr_output);
if (preferred_mode != NULL) {
oc->width = preferred_mode->width;
oc->height = preferred_mode->height;
oc->refresh_rate = preferred_mode->refresh;
if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode =
wl_container_of(wlr_output->modes.prev, mode, link);
oc->width = mode->width;
oc->height = mode->height;
oc->refresh_rate = mode->refresh;
}
oc->x = oc->y = -1;
oc->scale = 1;
Expand Down

5 comments on commit 724926e

@Mel34
Copy link

@Mel34 Mel34 commented on 724926e Aug 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm getting a compile error when I try to rebuild sway-git:
https://pastebin.com/TkNuhet1

@Emantor
Copy link
Contributor Author

@Emantor Emantor commented on 724926e Aug 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update to latest wlroots.
Your package manager tries to update sway before wlroots, this needs to be the other way around.

@Mel34
Copy link

@Mel34 Mel34 commented on 724926e Aug 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll do that, ty. May I ask what's the future of atomic modesetting in sway?

@Emantor
Copy link
Contributor Author

@Emantor Emantor commented on 724926e Aug 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sway and wlroots already use atomic modesetting on supported hardware. The corresponding commit in wlroots made changes to outputs,transforms, etc atomic as in they are only applied on commit. This however conflicts with the current buffer flipping implementation, since the buffers are also committed in the same function.
So now the sequence on how the different changes inside the commit are applied would need to be done in the correct sequence relative to the changes itself.
Long term wlroots wants to support more of the atomic features, but this will probably be done in a new backend.
For reference see swaywm/wlroots#1688

@Mel34
Copy link

@Mel34 Mel34 commented on 724926e Aug 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ty for this insightful reply.

Please sign in to comment.