diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-19 10:45:36 -0500 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-02-19 16:49:51 +0100 |
| commit | 50011e7170d1d6a58a6b1e4997da6ce105180481 (patch) | |
| tree | 70c95139675c92e5d968cd97898dd42524f5bfe1 | |
| parent | dcd05f67ab694c72e0f95b506a756471e2222fac (diff) | |
backend/drm: fix modeset on drm fd resume
On DRM resume, such as switching back to a TTY, the output needs to be
modeset to the current mode. However, wlr_output_set_mode will return
early when attempting to set the mode to the current mode. This just
steps around wlr_output_set_mode and calls drm_connector_set_mode
directly.
| -rw-r--r-- | backend/drm/backend.c | 3 | ||||
| -rw-r--r-- | backend/drm/drm.c | 5 | ||||
| -rw-r--r-- | include/backend/drm/drm.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c index e1ec0966..7fdab816 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -93,7 +93,8 @@ 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.enabled) { - wlr_output_set_mode(&conn->output, conn->output.current_mode); + drm_connector_set_mode(&conn->output, + conn->output.current_mode); } else { enable_drm_connector(&conn->output, false); } diff --git a/backend/drm/drm.c b/backend/drm/drm.c index e0eed4c2..a7719727 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -392,9 +392,6 @@ static void drm_connector_start_renderer(struct wlr_drm_connector *conn) { } } -static bool drm_connector_set_mode(struct wlr_output *output, - struct wlr_output_mode *mode); - static void realloc_crtcs(struct wlr_drm_backend *drm, bool *changed_outputs); static void attempt_enable_needs_modeset(struct wlr_drm_backend *drm) { @@ -522,7 +519,7 @@ static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in, static void drm_connector_cleanup(struct wlr_drm_connector *conn); -static bool drm_connector_set_mode(struct wlr_output *output, +bool drm_connector_set_mode(struct wlr_output *output, struct wlr_output_mode *mode) { struct wlr_drm_connector *conn = get_drm_connector_from_output(output); struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend); diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index c94d4f7d..6481f085 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -159,5 +159,7 @@ int handle_drm_event(int fd, uint32_t mask, void *data); bool enable_drm_connector(struct wlr_output *output, bool enable); bool set_drm_connector_gamma(struct wlr_output *output, size_t size, const uint16_t *r, const uint16_t *g, const uint16_t *b); +bool drm_connector_set_mode(struct wlr_output *output, + struct wlr_output_mode *mode); #endif |