aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-05-07 12:26:48 -0400
committerDrew DeVault <sir@cmpwn.com>2017-05-07 12:26:48 -0400
commit00931f2f8fa4098c5e70b5ececd6d2dcb8786f90 (patch)
tree45d3e79648d601161f483d3f66ac960851ba233f /backend
parent15b1ce9e6ced22a90ab0df7a6b86c6d35c40ca93 (diff)
Generalize output handling
Diffstat (limited to 'backend')
-rw-r--r--backend/CMakeLists.txt8
-rw-r--r--backend/backend.c3
-rw-r--r--backend/drm/backend.c11
-rw-r--r--backend/drm/drm.c387
4 files changed, 198 insertions, 211 deletions
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
index 7183617c..fc1793cf 100644
--- a/backend/CMakeLists.txt
+++ b/backend/CMakeLists.txt
@@ -5,10 +5,10 @@ include_directories(
)
add_library(wlr-backend
- wayland/backend.c
- wayland/registry.c
- wayland/wl_seat.c
- wayland/wl_output.c
+ #wayland/backend.c
+ #wayland/registry.c
+ #wayland/wl_seat.c
+ #wayland/wl_output.c
drm/backend.c
drm/drm.c
drm/udev.c
diff --git a/backend/backend.c b/backend/backend.c
index e40aaefe..753bb3ae 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -16,7 +16,6 @@ struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl,
backend->impl = impl;
wl_signal_init(&backend->events.output_add);
wl_signal_init(&backend->events.output_remove);
- wl_signal_init(&backend->events.output_frame);
wl_signal_init(&backend->events.keyboard_add);
wl_signal_init(&backend->events.keyboard_remove);
wl_signal_init(&backend->events.pointer_add);
@@ -32,6 +31,6 @@ bool wlr_backend_init(struct wlr_backend *backend) {
void wlr_backend_destroy(struct wlr_backend *backend) {
backend->impl->destroy(backend->state);
- // TODO: Free anything else?
+ // TODO: free outputs
free(backend);
}
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 8c02669a..0da84745 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -19,18 +19,11 @@ static bool wlr_drm_backend_init(struct wlr_backend_state *state) {
return true;
}
-static void free_output(void *item) {
- struct wlr_drm_output *out = item;
- wlr_drm_output_cleanup(out, true);
- free(out);
-}
-
static void wlr_drm_backend_destroy(struct wlr_backend_state *state) {
if (!state) {
return;
}
- list_foreach(state->outputs, free_output);
- list_free(state->outputs);
+ // TODO: free outputs in shared backend code
wlr_drm_renderer_free(&state->renderer);
wlr_udev_free(&state->udev);
wlr_session_close_file(state->session, state->fd);
@@ -86,6 +79,8 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
goto error_fd;
}
+ // TODO: what is the difference between the per-output renderer and this
+ // one?
if (!wlr_drm_renderer_init(&state->renderer, state->fd)) {
wlr_log(L_ERROR, "Failed to initialize renderer");
goto error_event;
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index abb3fb26..5b186e41 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -13,6 +13,7 @@
#include <GLES3/gl3.h>
#include <wayland-server.h>
+#include "wayland.h"
#include "backend.h"
#include "backend/drm/backend.h"
#include "backend/drm/drm.h"
@@ -39,7 +40,6 @@ static const char *conn_name[] = {
};
bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
-
renderer->gbm = gbm_create_device(fd);
if (!renderer->gbm) {
wlr_log(L_ERROR, "Failed to create GBM device: %s", strerror(errno));
@@ -59,7 +59,6 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) {
if (!renderer) {
return;
}
-
wlr_egl_free(&renderer->egl);
gbm_device_destroy(renderer->gbm);
}
@@ -95,79 +94,162 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) {
return *id;
}
-void wlr_drm_output_begin(struct wlr_drm_output *out) {
- struct wlr_drm_renderer *renderer = out->renderer;
- eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context);
+void wlr_drm_output_begin(struct wlr_output *output) {
+ struct wlr_output_state *_output = output->state;
+ struct wlr_drm_renderer *renderer = _output->renderer;
+ eglMakeCurrent(renderer->egl.display, _output->egl,
+ _output->egl, renderer->egl.context);
}
-void wlr_drm_output_end(struct wlr_drm_output *out) {
- struct wlr_drm_renderer *renderer = out->renderer;
- eglSwapBuffers(renderer->egl.display, out->egl);
+void wlr_drm_output_end(struct wlr_output *output) {
+ struct wlr_output_state *_output = output->state;
+ struct wlr_drm_renderer *renderer = _output->renderer;
- struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->gbm);
+ eglSwapBuffers(renderer->egl.display, _output->egl);
+ struct gbm_bo *bo = gbm_surface_lock_front_buffer(_output->gbm);
uint32_t fb_id = get_fb_for_bo(renderer->fd, bo);
-
- drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out);
-
- gbm_surface_release_buffer(out->gbm, bo);
-
- out->pageflip_pending = true;
+ drmModePageFlip(renderer->fd, _output->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, _output);
+ gbm_surface_release_buffer(_output->gbm, bo);
+ _output->pageflip_pending = true;
}
static bool display_init_renderer(struct wlr_drm_renderer *renderer,
- struct wlr_drm_output *out) {
-
- out->renderer = renderer;
-
- out->gbm = gbm_surface_create(renderer->gbm, out->width, out->height,
- GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
- if (!out->gbm) {
- wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", out->name,
+ struct wlr_output_state *output) {
+ struct wlr_output_mode *mode = output->wlr_output->current_mode;
+ output->renderer = renderer;
+ output->gbm = gbm_surface_create(renderer->gbm, mode->width,
+ mode->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+ if (!output->gbm) {
+ wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", output->name,
strerror(errno));
return false;
}
- out->egl = wlr_egl_create_surface(&renderer->egl, out->gbm);
- if (out->egl == EGL_NO_SURFACE) {
- wlr_log(L_ERROR, "Failed to create EGL surface for %s", out->name);
+ output->egl = wlr_egl_create_surface(&renderer->egl, output->gbm);
+ if (output->egl == EGL_NO_SURFACE) {
+ wlr_log(L_ERROR, "Failed to create EGL surface for %s", output->name);
return false;
}
// Render black frame
+ eglMakeCurrent(renderer->egl.display, output->egl, output->egl, renderer->egl.context);
- eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context);
-
- glViewport(0, 0, out->width, out->height);
+ glViewport(0, 0, output->width, output->height);
glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
- eglSwapBuffers(renderer->egl.display, out->egl);
+ eglSwapBuffers(renderer->egl.display, output->egl);
- struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->gbm);
+ struct gbm_bo *bo = gbm_surface_lock_front_buffer(output->gbm);
uint32_t fb_id = get_fb_for_bo(renderer->fd, bo);
- drmModeSetCrtc(renderer->fd, out->crtc, fb_id, 0, 0,
- &out->connector, 1, &out->active_mode->mode);
- drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out);
-
- gbm_surface_release_buffer(out->gbm, bo);
+ drmModeSetCrtc(renderer->fd, output->crtc, fb_id, 0, 0,
+ &output->connector, 1, &mode->state->mode);
+ drmModePageFlip(renderer->fd, output->crtc, fb_id,
+ DRM_MODE_PAGE_FLIP_EVENT, output);
+ gbm_surface_release_buffer(output->gbm, bo);
return true;
}
static int find_id(const void *item, const void *cmp_to) {
- const struct wlr_drm_output *out = item;
+ const struct wlr_output_state *output = item;
const uint32_t *id = cmp_to;
- if (out->connector < *id) {
+ if (output->connector < *id) {
return -1;
- } else if (out->connector > *id) {
+ } else if (output->connector > *id) {
return 1;
} else {
return 0;
}
}
+static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
+ struct wlr_output_mode *mode) {
+ struct wlr_backend_state *state =
+ wl_container_of(output->renderer, state, renderer);
+
+ wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", output->name,
+ mode->width, mode->height, mode->refresh);
+
+ drmModeConnector *conn = drmModeGetConnector(state->fd, output->connector);
+ if (!conn) {
+ wlr_log(L_ERROR, "Failed to get DRM connector");
+ goto error;
+ }
+
+ if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) {
+ wlr_log(L_ERROR, "%s is not connected", output->name);
+ goto error;
+ }
+
+ drmModeRes *res = drmModeGetResources(state->fd);
+ if (!res) {
+ wlr_log(L_ERROR, "Failed to get DRM resources");
+ goto error;
+ }
+
+ bool success = false;
+ for (int i = 0; !success && i < conn->count_encoders; ++i) {
+ drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]);
+ if (!enc) {
+ continue;
+ }
+
+ for (int j = 0; j < res->count_crtcs; ++j) {
+ if ((enc->possible_crtcs & (1 << j)) == 0) {
+ continue;
+ }
+
+ if ((state->taken_crtcs & (1 << j)) == 0) {
+ state->taken_crtcs |= 1 << j;
+ output->crtc = res->crtcs[j];
+ success = true;
+ break;
+ }
+ }
+ drmModeFreeEncoder(enc);
+ }
+
+ drmModeFreeResources(res);
+
+ if (!success) {
+ wlr_log(L_ERROR, "Failed to find CRTC for %s", output->name);
+ goto error;
+ }
+
+ output->state = DRM_OUTPUT_CONNECTED;
+ output->width = mode->width;
+ output->height = mode->height;
+ output->wlr_output->current_mode = mode;
+
+ if (!display_init_renderer(&state->renderer, output)) {
+ wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->name);
+ goto error;
+ }
+
+ drmModeFreeConnector(conn);
+ return true;
+
+error:
+ // TODO: destroy
+ wlr_drm_output_cleanup(output, false);
+ drmModeFreeConnector(conn);
+ return false;
+}
+
+static void wlr_drm_output_destroy(struct wlr_output_state *output) {
+ wlr_drm_output_cleanup(output, true);
+ wlr_drm_renderer_free(output->renderer);
+ free(output);
+}
+
+static struct wlr_output_impl output_impl = {
+ .set_mode = wlr_drm_output_set_mode,
+ .destroy = wlr_drm_output_destroy,
+};
+
void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
wlr_log(L_INFO, "Scanning DRM connectors");
@@ -186,171 +268,98 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
continue;
}
- struct wlr_drm_output *out;
+ struct wlr_output_state *output;
+ struct wlr_output *wlr_output;
int index = list_seq_find(state->outputs, find_id, &id);
if (index == -1) {
- out = calloc(1, sizeof(struct wlr_drm_output));
- if (!out) {
+ output = calloc(1, sizeof(struct wlr_output_state));
+ if (!state) {
+ drmModeFreeConnector(conn);
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
+ return;
+ }
+ wlr_output = output->wlr_output = wlr_output_create(&output_impl, output);
+ if (!wlr_output) {
drmModeFreeConnector(conn);
- continue;
+ wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
+ return;
}
- out->renderer = &state->renderer;
- out->state = DRM_OUTPUT_DISCONNECTED;
- out->connector = id;
- snprintf(out->name, sizeof out->name, "%s-%"PRIu32,
+ output->renderer = &state->renderer;
+ output->state = DRM_OUTPUT_DISCONNECTED;
+ output->connector = id;
+ // TODO: Populate more wlr_output fields
+ // TODO: Move this to wlr_output->name
+ snprintf(output->name, sizeof(output->name), "%s-%"PRIu32,
conn_name[conn->connector_type],
conn->connector_type_id);
drmModeEncoder *curr_enc = drmModeGetEncoder(state->fd, conn->encoder_id);
if (curr_enc) {
- out->old_crtc = drmModeGetCrtc(state->fd, curr_enc->crtc_id);
+ output->old_crtc = drmModeGetCrtc(state->fd, curr_enc->crtc_id);
free(curr_enc);
}
- list_add(state->outputs, out);
- wlr_log(L_INFO, "Found display '%s'", out->name);
+ list_add(state->outputs, output);
+ wlr_log(L_INFO, "Found display '%s'", output->name);
} else {
- out = state->outputs->items[index];
+ output = state->outputs->items[index];
+ wlr_output = output->wlr_output;
}
- if (out->state == DRM_OUTPUT_DISCONNECTED &&
+ // TODO: move state into wlr_output
+ if (output->state == DRM_OUTPUT_DISCONNECTED &&
conn->connection == DRM_MODE_CONNECTED) {
- wlr_log(L_INFO, "'%s' connected", out->name);
-
- out->modes = malloc(sizeof(*out->modes) * conn->count_modes);
- if (!out->modes) {
- wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
- goto error;
- }
-
+ wlr_log(L_INFO, "'%s' connected", output->name);
wlr_log(L_INFO, "Detected modes:");
- out->num_modes = conn->count_modes;
for (int i = 0; i < conn->count_modes; ++i) {
- drmModeModeInfo *mode = &conn->modes[i];
- out->modes[i].width = mode->hdisplay;
- out->modes[i].height = mode->vdisplay;
+ struct wlr_output_mode_state *_state = calloc(1,
+ sizeof(struct wlr_output_mode_state));
+ _state->mode = conn->modes[i];
+ struct wlr_output_mode *mode = calloc(1,
+ sizeof(struct wlr_output_mode));
+ mode->width = _state->mode.hdisplay;
// TODO: Calculate more accurate refresh rate
- out->modes[i].rate = mode->vrefresh;
- out->modes[i].mode = *mode;
+ // TODO: Check that this refresh rate is mHz
+ mode->height = _state->mode.vdisplay;
+ mode->state = _state;
wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32,
- mode->hdisplay, mode->vdisplay,
- mode->vrefresh);
- }
-
- out->state = DRM_OUTPUT_NEEDS_MODESET;
- wlr_log(L_INFO, "Sending modesetting signal for '%s'", out->name);
- wl_signal_emit(&state->backend->events.output_add, out);
- } else if (out->state == DRM_OUTPUT_CONNECTED &&
- conn->connection != DRM_MODE_CONNECTED) {
-
- wlr_log(L_INFO, "'%s' disconnected", out->name);
- wlr_drm_output_cleanup(out, false);
- }
-error:
- drmModeFreeConnector(conn);
- }
-
- drmModeFreeResources(res);
-}
-
-struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t *count) {
- if (out->state == DRM_OUTPUT_DISCONNECTED) {
- *count = 0;
- return NULL;
- }
-
- *count = out->num_modes;
- return out->modes;
-}
-
-bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode) {
- struct wlr_backend_state *state = wl_container_of(out->renderer, state, renderer);
-
- wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u'", out->name, mode->width,
- mode->height, mode->rate);
-
- drmModeConnector *conn = drmModeGetConnector(state->fd, out->connector);
- if (!conn) {
- wlr_log(L_ERROR, "Failed to get DRM connector");
- goto error;
- }
-
- if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) {
- wlr_log(L_ERROR, "%s is not connected", out->name);
- goto error;
- }
-
- drmModeRes *res = drmModeGetResources(state->fd);
- if (!res) {
- wlr_log(L_ERROR, "Failed to get DRM resources");
- goto error;
- }
-
- bool success = false;
- for (int i = 0; !success && i < conn->count_encoders; ++i) {
- drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]);
- if (!enc)
- continue;
+ _state->mode.hdisplay, _state->mode.vdisplay,
+ _state->mode.vrefresh);
- for (int j = 0; j < res->count_crtcs; ++j) {
- if ((enc->possible_crtcs & (1 << j)) == 0) {
- continue;
+ list_add(wlr_output->modes, mode);
}
- if ((state->taken_crtcs & (1 << j)) == 0) {
- state->taken_crtcs |= 1 << j;
- out->crtc = res->crtcs[j];
+ output->state = DRM_OUTPUT_NEEDS_MODESET;
+ wlr_log(L_INFO, "Sending modesetting signal for '%s'", output->name);
+ wl_signal_emit(&state->backend->events.output_add, wlr_output);
+ } else if (output->state == DRM_OUTPUT_CONNECTED &&
+ conn->connection != DRM_MODE_CONNECTED) {
- success = true;
- break;
- }
+ wlr_log(L_INFO, "'%s' disconnected", output->name);
+ // TODO: Destroy
+ wlr_drm_output_cleanup(output, false);
}
- drmModeFreeEncoder(enc);
+ drmModeFreeConnector(conn);
}
drmModeFreeResources(res);
-
- if (!success) {
- wlr_log(L_ERROR, "Failed to find CRTC for %s", out->name);
- goto error;
- }
-
- out->state = DRM_OUTPUT_CONNECTED;
- out->active_mode = mode;
- out->width = mode->width;
- out->height = mode->height;
-
- if (!display_init_renderer(&state->renderer, out)) {
- wlr_log(L_ERROR, "Failed to initalise renderer for %s", out->name);
- goto error;
- }
-
- drmModeFreeConnector(conn);
-
- return true;
-
-error:
- wlr_drm_output_cleanup(out, false);
- drmModeFreeConnector(conn);
-
- return false;
}
static void page_flip_handler(int fd, unsigned seq,
unsigned tv_sec, unsigned tv_usec, void *user) {
- struct wlr_drm_output *out = user;
- struct wlr_backend_state *state = wl_container_of(out->renderer, state, renderer);
+ struct wlr_output_state *output = user;
+ struct wlr_backend_state *state =
+ wl_container_of(output->renderer, state, renderer);
- out->pageflip_pending = false;
- if (out->state == DRM_OUTPUT_CONNECTED) {
- wl_signal_emit(&state->backend->events.output_frame, out);
+ output->pageflip_pending = false;
+ if (output->state == DRM_OUTPUT_CONNECTED) {
+ wl_signal_emit(&output->wlr_output->events.frame, output->wlr_output);
}
}
@@ -361,66 +370,50 @@ int wlr_drm_event(int fd, uint32_t mask, void *data) {
};
drmHandleEvent(fd, &event);
-
return 1;
}
-static void restore_output(struct wlr_drm_output *out, int fd) {
+static void restore_output(struct wlr_output_state *output, int fd) {
// Wait for any pending pageflips to finish
- while (out->pageflip_pending) {
+ while (output->pageflip_pending) {
wlr_drm_event(fd, 0, NULL);
}
- drmModeCrtc *crtc = out->old_crtc;
+ drmModeCrtc *crtc = output->old_crtc;
if (!crtc) {
return;
}
drmModeSetCrtc(fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y,
- &out->connector, 1, &crtc->mode);
+ &output->connector, 1, &crtc->mode);
drmModeFreeCrtc(crtc);
}
-void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) {
- if (!out) {
+void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
+ if (!output) {
return;
}
- struct wlr_drm_renderer *renderer = out->renderer;
+ struct wlr_drm_renderer *renderer = output->renderer;
struct wlr_backend_state *state = wl_container_of(renderer, state, renderer);
- switch (out->state) {
+ switch (output->state) {
case DRM_OUTPUT_CONNECTED:
- eglDestroySurface(renderer->egl.display, out->egl);
- gbm_surface_destroy(out->gbm);
-
- out->egl = EGL_NO_SURFACE;
- out->gbm = NULL;
+ eglDestroySurface(renderer->egl.display, output->egl);
+ gbm_surface_destroy(output->gbm);
+ output->egl = EGL_NO_SURFACE;
+ output->gbm = NULL;
/* Fallthrough */
-
case DRM_OUTPUT_NEEDS_MODESET:
- free(out->modes);
- out->num_modes = 0;
- out->modes = NULL;
- out->active_mode = NULL;
- out->width = 0;
- out->height = 0;
-
- out->state = DRM_OUTPUT_DISCONNECTED;
-
+ output->state = DRM_OUTPUT_DISCONNECTED;
if (restore) {
- restore_output(out, renderer->fd);
+ restore_output(output, renderer->fd);
}
-
- wlr_log(L_INFO, "Emmiting destruction signal for '%s'", out->name);
- wl_signal_emit(&state->backend->events.output_remove, out);
+ wlr_log(L_INFO, "Emmiting destruction signal for '%s'", output->name);
+ wl_signal_emit(&state->backend->events.output_remove, output->wlr_output);
break;
-
case DRM_OUTPUT_DISCONNECTED:
break;
}
-}
-
-const char *wlr_drm_output_get_name(struct wlr_drm_output *out) {
- return out->name;
+ // TODO: free wlr_output
}