diff options
| author | Markus Ongyerth <ongy@ongy.net> | 2018-01-23 17:40:12 +0100 |
|---|---|---|
| committer | Markus Ongyerth <ongy@ongy.net> | 2018-01-23 17:40:12 +0100 |
| commit | 3cf7225cec637c90f4a676aa02dee9ad06dadee9 (patch) | |
| tree | 2cc642f5bb00a71f75f377abdeb66cd8a72774db /backend/drm | |
| parent | 03440bbd83b5d68404db8ebc2df310ec0f8c9b32 (diff) | |
| download | wlroots-3cf7225cec637c90f4a676aa02dee9ad06dadee9.tar.xz | |
decouples outputenable state and wl_output global
This decouples wlr_output_enable and the wl_global.
The previously internal functions wlr_output_(destroy/create)_global are
exposed and used automatically in the wlr_output_layout to create/tear
down the global.
The compositor can handle them itself if it wants to, but I think this
is the right moment to create/destroy the wl_output when the
wlr_output_layout is used.
Diffstat (limited to 'backend/drm')
| -rw-r--r-- | backend/drm/drm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 47bd4e3a..fc2721f3 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -267,7 +267,7 @@ static void wlr_drm_connector_enable(struct wlr_output *output, bool enable) { wlr_drm_connector_start_renderer(conn); } - wlr_output_update_enabled(&conn->output, enable); + conn->output.enabled = enable; } static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in, @@ -813,7 +813,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) { wl_list_insert(&wlr_conn->output.modes, &mode->wlr_mode.link); } - wlr_output_update_enabled(&wlr_conn->output, true); + wlr_conn->output.enabled = true; wlr_conn->state = WLR_DRM_CONN_NEEDS_MODESET; wlr_log(L_INFO, "Sending modesetting signal for '%s'", @@ -823,7 +823,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) { drm_conn->connection != DRM_MODE_CONNECTED) { wlr_log(L_INFO, "'%s' disconnected", wlr_conn->output.name); - wlr_output_update_enabled(&wlr_conn->output, false); + wlr_conn->output.enabled = false; wlr_drm_connector_cleanup(wlr_conn); } |