From aca13320b3e6df8cb575f64db736dc38b8b30ed2 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Mon, 1 May 2017 15:20:48 +1200 Subject: [PATCH 01/21] Inital commit of libotd. --- backend/drm/drm.c | 466 ++++++++++++++++++++++++++++++++++++++++++ backend/drm/drm.h | 54 +++++ backend/drm/event.c | 91 +++++++++ backend/drm/event.h | 21 ++ backend/drm/main.c | 160 +++++++++++++++ backend/drm/otd.c | 71 +++++++ backend/drm/otd.h | 44 ++++ backend/drm/session.c | 224 ++++++++++++++++++++ backend/drm/session.h | 25 +++ backend/drm/udev.c | 158 ++++++++++++++ backend/drm/udev.h | 9 + 11 files changed, 1323 insertions(+) create mode 100644 backend/drm/drm.c create mode 100644 backend/drm/drm.h create mode 100644 backend/drm/event.c create mode 100644 backend/drm/event.h create mode 100644 backend/drm/main.c create mode 100644 backend/drm/otd.c create mode 100644 backend/drm/otd.h create mode 100644 backend/drm/session.c create mode 100644 backend/drm/session.h create mode 100644 backend/drm/udev.c create mode 100644 backend/drm/udev.h diff --git a/backend/drm/drm.c b/backend/drm/drm.c new file mode 100644 index 000000000..bb6359c59 --- /dev/null +++ b/backend/drm/drm.c @@ -0,0 +1,466 @@ +#include "otd.h" +#include "drm.h" +#include "event.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static const char *conn_name[] = { + [DRM_MODE_CONNECTOR_Unknown] = "Unknown", + [DRM_MODE_CONNECTOR_VGA] = "VGA", + [DRM_MODE_CONNECTOR_DVII] = "DVI-I", + [DRM_MODE_CONNECTOR_DVID] = "DVI-D", + [DRM_MODE_CONNECTOR_DVIA] = "DVI-A", + [DRM_MODE_CONNECTOR_Composite] = "Composite", + [DRM_MODE_CONNECTOR_SVIDEO] = "SVIDEO", + [DRM_MODE_CONNECTOR_LVDS] = "LVDS", + [DRM_MODE_CONNECTOR_Component] = "Component", + [DRM_MODE_CONNECTOR_9PinDIN] = "DIN", + [DRM_MODE_CONNECTOR_DisplayPort] = "DP", + [DRM_MODE_CONNECTOR_HDMIA] = "HDMI-A", + [DRM_MODE_CONNECTOR_HDMIB] = "HDMI-B", + [DRM_MODE_CONNECTOR_TV] = "TV", + [DRM_MODE_CONNECTOR_eDP] = "eDP", + [DRM_MODE_CONNECTOR_VIRTUAL] = "Virtual", + [DRM_MODE_CONNECTOR_DSI] = "DSI", +}; + +// EGL extensions +PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display; +PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface; + +static bool egl_exts() +{ + get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC) + eglGetProcAddress("eglGetPlatformDisplayEXT"); + + create_platform_window_surface = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) + eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); + + return get_platform_display && create_platform_window_surface; +} + +bool egl_get_config(EGLDisplay disp, EGLConfig *out) +{ + EGLint count = 0, matched = 0, ret; + + ret = eglGetConfigs(disp, NULL, 0, &count); + if (ret == EGL_FALSE || count == 0) { + return false; + } + + EGLConfig configs[count]; + + ret = eglChooseConfig(disp, NULL, configs, count, &matched); + if (ret == EGL_FALSE) { + return false; + } + + for (int i = 0; i < matched; ++i) { + EGLint gbm_format; + + if (!eglGetConfigAttrib(disp, + configs[i], + EGL_NATIVE_VISUAL_ID, + &gbm_format)) + continue; + + if (gbm_format == GBM_FORMAT_XRGB8888) { + *out = configs[i]; + return true; + } + } + + return false; +} + +bool init_renderer(struct otd *otd) +{ + if (!egl_exts()) { + fprintf(stderr, "Could not get EGL extensions\n"); + return false; + } + + otd->gbm = gbm_create_device(otd->fd); + if (!otd->gbm) { + fprintf(stderr, "Could not create gbm device: %s\n", strerror(errno)); + return false; + } + + if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) { + fprintf(stderr, "Could not bind GLES3 API\n"); + goto error_gbm; + } + + otd->egl.disp = get_platform_display(EGL_PLATFORM_GBM_MESA, otd->gbm, NULL); + if (otd->egl.disp == EGL_NO_DISPLAY) { + fprintf(stderr, "Could not create EGL display\n"); + goto error_gbm; + } + + if (eglInitialize(otd->egl.disp, NULL, NULL) == EGL_FALSE) { + fprintf(stderr, "Could not initalise EGL\n"); + goto error_egl; + } + + if (!egl_get_config(otd->egl.disp, &otd->egl.conf)) { + fprintf(stderr, "Could not get EGL config\n"); + goto error_egl; + } + + static const EGLint attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE}; + otd->egl.context = eglCreateContext(otd->egl.disp, otd->egl.conf, EGL_NO_CONTEXT, attribs); + if (otd->egl.context == EGL_NO_CONTEXT) { + fprintf(stderr, "Could not create EGL context\n"); + goto error_egl; + } + + return true; + +error_egl: + eglTerminate(otd->egl.disp); + eglReleaseThread(); + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + +error_gbm: + gbm_device_destroy(otd->gbm); + + return false; +} + +void destroy_renderer(struct otd *otd) +{ + if (!otd) + return; + + eglDestroyContext(otd->egl.disp, otd->egl.context); + eglTerminate(otd->egl.disp); + eglReleaseThread(); + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + + gbm_device_destroy(otd->gbm); +} + +void scan_connectors(struct otd *otd) +{ + drmModeRes *res = drmModeGetResources(otd->fd); + if (!res) + return; + + // I don't know if this needs to be allocated with realloc like this, + // as it may not even be possible for the number of connectors to change. + // I'll just have to see how DisplayPort MST works with DRM. + if ((size_t)res->count_connectors > otd->display_len) { + struct otd_display *new = realloc(otd->displays, sizeof *new * res->count_connectors); + if (!new) + goto error; + + for (int i = otd->display_len; i < res->count_connectors; ++i) { + new[i] = (struct otd_display) { + .state = OTD_DISP_INVALID, + .otd = otd, + }; + } + + otd->display_len = res->count_connectors; + otd->displays = new; + } + + for (int i = 0; i < res->count_connectors; ++i) { + struct otd_display *disp = &otd->displays[i]; + drmModeConnector *conn = drmModeGetConnector(otd->fd, res->connectors[i]); + if (!conn) + continue; + + if (otd->displays[i].state == OTD_DISP_INVALID) { + disp->state = OTD_DISP_DISCONNECTED; + disp->connector = res->connectors[i]; + snprintf(disp->name, sizeof disp->name, "%s-%"PRIu32, + conn_name[conn->connector_type], + conn->connector_type_id); + } + + if (disp->state == OTD_DISP_DISCONNECTED && + conn->connection == DRM_MODE_CONNECTED) { + disp->state = OTD_DISP_NEEDS_MODESET; + event_add(otd, disp, OTD_EV_DISPLAY_ADD); + + } else if (disp->state == OTD_DISP_CONNECTED && + conn->connection != DRM_MODE_CONNECTED) { + disp->state = OTD_DISP_DISCONNECTED; + event_add(otd, disp, OTD_EV_DISPLAY_REM); + } + + drmModeFreeConnector(conn); + } + +error: + drmModeFreeResources(res); +} + +static void free_fb(struct gbm_bo *bo, void *data) +{ + uint32_t *id = data; + + if (id && *id) + drmModeRmFB(gbm_bo_get_fd(bo), *id); + + free(id); +} + +static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) +{ + uint32_t *id = gbm_bo_get_user_data(bo); + + if (id) + return *id; + + id = calloc(1, sizeof *id); + if (!id) + return 0; + + drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32, + gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id); + + gbm_bo_set_user_data(bo, id, free_fb); + + return *id; +} + +static void init_display_renderer(struct otd *otd, struct otd_display *disp) +{ + disp->gbm = gbm_surface_create(otd->gbm, + disp->width, disp->height, + GBM_FORMAT_XRGB8888, + GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); + if (!disp->gbm) + return; + + disp->egl = create_platform_window_surface(otd->egl.disp, otd->egl.conf, + disp->gbm, NULL); + if (disp->egl == EGL_NO_SURFACE) + return; + + // Render black frame + + eglMakeCurrent(otd->egl.disp, disp->egl, disp->egl, otd->egl.context); + + glViewport(0, 0, disp->width, disp->height); + glClearColor(0.0, 0.0, 0.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + + eglSwapBuffers(otd->egl.disp, disp->egl); + + struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); + uint32_t fb_id = get_fb_for_bo(otd->fd, bo); + + drmModeSetCrtc(otd->fd, disp->crtc, fb_id, 0, 0, + &disp->connector, 1, disp->active_mode); + drmModePageFlip(otd->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); + + gbm_surface_release_buffer(disp->gbm, bo); +} + +static drmModeModeInfo *select_mode(size_t num_modes, + drmModeModeInfo modes[static num_modes], + drmModeCrtc *old_crtc, + const char *str) +{ + if (strcmp(str, "preferred") == 0) + return &modes[0]; + + if (strcmp(str, "current") == 0) { + if (!old_crtc) { + fprintf(stderr, "Display does not have currently configured mode\n"); + return NULL; + } + + for (size_t i = 0; i < num_modes; ++i) { + if (memcmp(&modes[i], &old_crtc->mode, sizeof modes[0]) == 0) + return &modes[i]; + } + + // We should never get here + assert(0); + } + + unsigned width = 0; + unsigned height = 0; + unsigned rate = 0; + int ret; + + if ((ret = sscanf(str, "%ux%u@%u", &width, &height, &rate)) != 2 && ret != 3) { + fprintf(stderr, "Invalid modesetting string\n"); + return NULL; + } + + for (size_t i = 0; i < num_modes; ++i) { + if (modes[i].hdisplay == width && + modes[i].vdisplay == height && + (!rate || modes[i].vrefresh == rate)) + return &modes[i]; + } + + return NULL; +} + +bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str) +{ + drmModeConnector *conn = drmModeGetConnector(otd->fd, disp->connector); + if (!conn || conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) + goto error; + + disp->num_modes = conn->count_modes; + disp->modes = malloc(sizeof *disp->modes * disp->num_modes); + if (!disp->modes) + goto error; + memcpy(disp->modes, conn->modes, sizeof *disp->modes * disp->num_modes); + + drmModeEncoder *curr_enc = drmModeGetEncoder(otd->fd, conn->encoder_id); + if (curr_enc) { + disp->old_crtc = drmModeGetCrtc(otd->fd, curr_enc->crtc_id); + free(curr_enc); + } + + disp->active_mode = select_mode(disp->num_modes, disp->modes, disp->old_crtc, str); + if (!disp->active_mode) { + fprintf(stderr, "Could not find mode '%s' for %s\n", str, disp->name); + goto error; + } + + fprintf(stderr, "Configuring %s with mode %ux%u@%u\n", + disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay, + disp->active_mode->vrefresh); + + drmModeRes *res = drmModeGetResources(otd->fd); + if (!res) + goto error; + + bool success = false; + for (int i = 0; !success && i < conn->count_encoders; ++i) { + drmModeEncoder *enc = drmModeGetEncoder(otd->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 ((otd->taken_crtcs & (1 << j)) == 0) { + otd->taken_crtcs |= 1 << j; + disp->crtc = res->crtcs[j]; + + success = true; + break; + } + } + + drmModeFreeEncoder(enc); + } + + drmModeFreeResources(res); + + if (!success) + goto error; + + disp->state = OTD_DISP_CONNECTED; + drmModeFreeConnector(conn); + + disp->width = disp->active_mode->hdisplay; + disp->height = disp->active_mode->vdisplay; + + init_display_renderer(otd, disp); + + return true; +error: + disp->state = OTD_DISP_DISCONNECTED; + drmModeFreeConnector(conn); + + event_add(otd, disp, OTD_EV_DISPLAY_REM); + + return false; +} + + +void page_flip_handler(int fd, + unsigned seq, + unsigned tv_sec, + unsigned tv_usec, + void *user) +{ + struct otd_display *disp = user; + + disp->pageflip_pending = true; + if (!disp->cleanup) + event_add(disp->otd, disp, OTD_EV_RENDER); +} + +void destroy_display_renderer(struct otd *otd, struct otd_display *disp) +{ + if (!otd || !disp || disp->state != OTD_DISP_CONNECTED) + return; + + drmModeCrtc *crtc = disp->old_crtc; + if (crtc) { + drmEventContext event = { + .version = DRM_EVENT_CONTEXT_VERSION, + .page_flip_handler = page_flip_handler, + }; + + disp->cleanup = true; + while (disp->pageflip_pending) + drmHandleEvent(otd->fd, &event); + + drmModeSetCrtc(otd->fd, crtc->crtc_id, crtc->buffer_id, + crtc->x, crtc->y, &disp->connector, + 1, &crtc->mode); + drmModeFreeCrtc(crtc); + } + + eglDestroySurface(otd->egl.disp, disp->egl); + gbm_surface_destroy(disp->gbm); + + free(disp->modes); +} + +void get_drm_event(struct otd *otd) +{ + drmEventContext event = { + .version = DRM_EVENT_CONTEXT_VERSION, + .page_flip_handler = page_flip_handler, + }; + + drmHandleEvent(otd->fd, &event); +} + +void rendering_begin(struct otd_display *disp) +{ + struct otd *otd = disp->otd; + eglMakeCurrent(otd->egl.disp, disp->egl, disp->egl, otd->egl.context); +} + +void rendering_end(struct otd_display *disp) +{ + struct otd *otd = disp->otd; + eglSwapBuffers(otd->egl.disp, disp->egl); + + struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); + uint32_t fb_id = get_fb_for_bo(otd->fd, bo); + + drmModePageFlip(otd->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); + + gbm_surface_release_buffer(disp->gbm, bo); + + disp->pageflip_pending = false; +} diff --git a/backend/drm/drm.h b/backend/drm/drm.h new file mode 100644 index 000000000..8744b4400 --- /dev/null +++ b/backend/drm/drm.h @@ -0,0 +1,54 @@ +#ifndef DRM_H +#define DRM_H + +#include +#include +#include +#include +#include + +enum otd_display_state { + OTD_DISP_INVALID, + OTD_DISP_DISCONNECTED, + OTD_DISP_NEEDS_MODESET, + OTD_DISP_CONNECTED, +}; + +struct otd_display { + struct otd *otd; + + enum otd_display_state state; + uint32_t connector; + char name[16]; + + size_t num_modes; + drmModeModeInfo *modes; + drmModeModeInfo *active_mode; + + uint32_t width; + uint32_t height; + + uint32_t crtc; + drmModeCrtc *old_crtc; + + struct gbm_surface *gbm; + EGLSurface *egl; + uint32_t fb_id; + + bool pageflip_pending; + bool cleanup; +}; + +bool init_renderer(struct otd *otd); +void destroy_renderer(struct otd *otd); + +void scan_connectors(struct otd *otd); +bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str); +void destroy_display_renderer(struct otd *otd, struct otd_display *disp); + +void get_drm_event(struct otd *otd); + +void rendering_begin(struct otd_display *disp); +void rendering_end(struct otd_display *disp); + +#endif diff --git a/backend/drm/event.c b/backend/drm/event.c new file mode 100644 index 000000000..f20cb2828 --- /dev/null +++ b/backend/drm/event.c @@ -0,0 +1,91 @@ +#include "otd.h" +#include "event.h" +#include "drm.h" +#include "udev.h" + +#include +#include +#include + +static inline void event_swap(struct otd_event *a, struct otd_event *b) +{ + struct otd_event tmp = *a; + *a = *b; + *b = tmp; +} + +bool otd_get_event(struct otd *otd, struct otd_event *restrict ret) +{ + struct pollfd fds[] = { + { .fd = otd->fd, .events = POLLIN }, + { .fd = otd->udev_fd, .events = POLLIN }, + }; + + while (poll(fds, 2, 0) > 0) { + if (fds[0].revents) + get_drm_event(otd); + if (fds[1].revents) + otd_udev_event(otd); + } + + if (otd->event_len == 0) { + ret->type = OTD_EV_NONE; + ret->display = NULL; + return false; + } + + struct otd_event *ev = otd->events; + + // Downheap + *ret = ev[0]; + ev[0] = ev[--otd->event_len]; + + size_t i = 0; + while (i < otd->event_len / 2) { + size_t left = i * 2 + 1; + size_t right = i * 2 + 2; + size_t max = (ev[left].type > ev[right].type) ? left : right; + + if (ev[i].type <= ev[max].type) { + event_swap(&ev[i], &ev[max]); + i = max; + } else { + break; + } + } + + return true; +} + +bool event_add(struct otd *otd, struct otd_display *disp, enum otd_event_type type) +{ + if (type == OTD_EV_NONE) + return true; + + if (otd->event_len == otd->event_cap) { + size_t new_size = (otd->event_cap == 0) ? 8 : otd->event_cap * 2; + + struct otd_event *new = realloc(otd->events, sizeof *new * new_size); + if (!new) { + return false; + } + + otd->event_cap = new_size; + otd->events = new; + } + + struct otd_event *ev = otd->events; + + // Upheap + size_t i = otd->event_len++; + ev[i].type = type; + ev[i].display = disp; + + size_t j; + while (i > 0 && ev[i].type > ev[(j = (i - 1) / 2)].type) { + event_swap(&ev[i], &ev[j]); + i = j; + } + + return true; +} diff --git a/backend/drm/event.h b/backend/drm/event.h new file mode 100644 index 000000000..fc4f6f9aa --- /dev/null +++ b/backend/drm/event.h @@ -0,0 +1,21 @@ +#ifndef EVENT_H +#define EVENT_H + +#include + +enum otd_event_type { + OTD_EV_NONE, + OTD_EV_RENDER, + OTD_EV_DISPLAY_REM, + OTD_EV_DISPLAY_ADD, +}; + +struct otd_event { + enum otd_event_type type; + struct otd_display *display; +}; + +bool otd_get_event(struct otd *otd, struct otd_event *restrict ret); +bool event_add(struct otd *otd, struct otd_display *disp, enum otd_event_type type); + +#endif diff --git a/backend/drm/main.c b/backend/drm/main.c new file mode 100644 index 000000000..aab11e196 --- /dev/null +++ b/backend/drm/main.c @@ -0,0 +1,160 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "otd.h" +#include "drm.h" +#include "event.h" + +// I know this is pretty crappy, +// but it's just for the example's sake +struct { + char *name; + char *mode; +} displays[8]; +int num_displays = 0; + +noreturn void usage(const char *name, int ret) +{ + fprintf(stderr, "usage: %s [-o [-m ]]*\n" + "\n" + " -h \tDisplay this help text\n" + " -o \tWhich diplay to use. e.g. DVI-I-1.\n" + " -m \tWhich mode to use. It must come after an -o option.\n" + " \tMust be either 'preferred', 'current', widthxheight\n" + " \tor widthxheight@rate. Defaults to 'preferred'.\n" + "\n" + "example: %s -o DVI-I-1 -m 1920x1080@60 -o DP-1 -m 1920x1200\n", + name, name); + + exit(ret); +} + +void parse_args(int argc, char *argv[]) +{ + int c; + int i = -1; + + while ((c = getopt(argc, argv, "ho:m:")) != -1) { + switch (c) { + case 'h': + usage(argv[0], 0); + case 'o': + i = num_displays++; + + if (num_displays == 8) { + fprintf(stderr, "Too many displays\n"); + exit(1); + } + + displays[i].name = strdup(optarg); + break; + case 'm': + if (i == -1) { + fprintf(stderr, "A display is required first\n"); + exit(1); + } + + fprintf(stderr, "Assigned '%s' to '%s'\n", optarg, displays[i].name); + displays[i].mode = optarg; + i = -1; + break; + default: + usage(argv[0], 1); + } + } + + // Trailing args + if (optind != argc) { + usage(argv[0], 1); + } +} + +int main(int argc, char *argv[]) +{ + parse_args(argc, argv); + + struct otd *otd = otd_start(); + if (!otd) + return 1; + + float colour[3] = {1.0, 0.0, 0.0}; + int dec = 0; + + struct timespec start, now; + clock_gettime(CLOCK_MONOTONIC, &start); + struct timespec last = start; + + while (clock_gettime(CLOCK_MONOTONIC, &now) == 0 && + now.tv_sec < start.tv_sec + 10) { + + struct otd_event ev; + if (!otd_get_event(otd, &ev)) + continue; + + struct otd_display *disp = ev.display; + + switch (ev.type) { + case OTD_EV_RENDER: + rendering_begin(disp); + + // This is all just calculating the colours. + // It's not particularly important. + + long ms = (now.tv_sec - last.tv_sec) * 1000 + + (now.tv_nsec - last.tv_nsec) / 1000000; + + int inc = (dec + 1) % 3; + + colour[dec] -= ms / 2000.0f; + colour[inc] += ms / 2000.0f; + + if (colour[dec] < 0.0f) { + colour[dec] = 0.0f; + colour[inc] = 1.0f; + + dec = (dec + 1) % 3; + } + + last = now; + + glViewport(0, 0, disp->width, disp->height); + glClearColor(colour[0], colour[1], colour[2], 1.0f); + glClear(GL_COLOR_BUFFER_BIT); + + rendering_end(disp); + break; + case OTD_EV_DISPLAY_REM: + printf("%s removed\n", disp->name); + break; + case OTD_EV_DISPLAY_ADD: + printf("%s added\n", disp->name); + + const char *mode = NULL; + for (int i = 0; i < num_displays; ++i) { + if (strcmp(disp->name, displays[i].name) == 0) { + mode = displays[i].mode; + } + } + if (!mode) + mode = "preferred"; + + if (!modeset_str(otd, ev.display, mode)) { + fprintf(stderr, "Modesetting %s failed\n", disp->name); + goto out; + } + break; + default: + break; + } + } + +out: + otd_finish(otd); +} diff --git a/backend/drm/otd.c b/backend/drm/otd.c new file mode 100644 index 000000000..3d5345c77 --- /dev/null +++ b/backend/drm/otd.c @@ -0,0 +1,71 @@ +#include +#include +#include + +#include "otd.h" +#include "drm.h" +#include "event.h" +#include "session.h" +#include "udev.h" + +struct otd *otd_start(void) +{ + struct otd *otd = calloc(1, sizeof *otd); + if (!otd) + return NULL; + + if (!otd_new_session(otd)) { + fprintf(stderr, "Could not create session\n"); + goto error; + } + + if (!otd_udev_start(otd)) { + fprintf(stderr, "Could not start udev\n"); + goto error_session; + } + + otd_udev_find_gpu(otd); + if (otd->fd == -1) { + fprintf(stderr, "Could not open GPU\n"); + goto error_udev; + } + + if (!init_renderer(otd)) { + fprintf(stderr, "Could not initalise renderer\n"); + goto error_fd; + } + + scan_connectors(otd); + + return otd; + +error_fd: + release_device(otd, otd->fd); +error_udev: + otd_udev_finish(otd); +error_session: + otd_close_session(otd); +error: + free(otd); + return NULL; +} + +void otd_finish(struct otd *otd) +{ + if (!otd) + return; + + for (size_t i = 0; i < otd->display_len; ++i) { + destroy_display_renderer(otd, &otd->displays[i]); + } + + destroy_renderer(otd); + otd_close_session(otd); + otd_udev_finish(otd); + + close(otd->fd); + free(otd->events); + free(otd->displays); + free(otd); +} + diff --git a/backend/drm/otd.h b/backend/drm/otd.h new file mode 100644 index 000000000..eef0e9916 --- /dev/null +++ b/backend/drm/otd.h @@ -0,0 +1,44 @@ +#ifndef LIBOTD_H +#define LIBOTD_H + +#include +#include +#include +#include +#include + +#include "session.h" + +struct otd { + int fd; + bool paused; + + // Priority Queue (Max-heap) + size_t event_cap; + size_t event_len; + struct otd_event *events; + + size_t display_len; + struct otd_display *displays; + + uint32_t taken_crtcs; + + struct gbm_device *gbm; + struct { + EGLDisplay disp; + EGLConfig conf; + EGLContext context; + } egl; + + struct otd_session session; + + struct udev *udev; + struct udev_monitor *mon; + int udev_fd; + char *drm_path; +}; + +struct otd *otd_start(void); +void otd_finish(struct otd *otd); + +#endif diff --git a/backend/drm/session.c b/backend/drm/session.c new file mode 100644 index 000000000..c845fb275 --- /dev/null +++ b/backend/drm/session.c @@ -0,0 +1,224 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "session.h" +#include "otd.h" + +int take_device(struct otd *restrict otd, + const char *restrict path, + bool *restrict paused_out) +{ + int ret; + int fd = -1; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + struct otd_session *s = &otd->session; + + struct stat st; + if (stat(path, &st) < 0) { + fprintf(stderr, "Failed to stat '%s'\n", path); + return -1; + } + + ret = sd_bus_call_method(s->bus, + "org.freedesktop.login1", + s->path, + "org.freedesktop.login1.Session", + "TakeDevice", + &error, &msg, + "uu", major(st.st_rdev), minor(st.st_rdev)); + if (ret < 0) { + fprintf(stderr, "%s\n", error.message); + goto error; + } + + int paused = 0; + ret = sd_bus_message_read(msg, "hb", &fd, &paused); + if (ret < 0) { + fprintf(stderr, "%s\n", strerror(-ret)); + goto error; + } + + // The original fd seem to be closed when the message is freed + // so we just clone it. + fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); + + if (paused_out) + *paused_out = paused; + +error: + sd_bus_error_free(&error); + sd_bus_message_unref(msg); + return fd; +} + +void release_device(struct otd *otd, int fd) +{ + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + struct otd_session *s = &otd->session; + + struct stat st; + if (fstat(fd, &st) < 0) { + fprintf(stderr, "Could not stat fd %d\n", fd); + return; + } + + ret = sd_bus_call_method(s->bus, + "org.freedesktop.login1", + s->path, + "org.freedesktop.login1.Session", + "ReleaseDevice", + &error, &msg, + "uu", major(st.st_rdev), minor(st.st_rdev)); + if (ret < 0) { + /* Log something */; + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); +} + +static bool session_activate(struct otd *otd) +{ + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + struct otd_session *s = &otd->session; + + ret = sd_bus_call_method(s->bus, + "org.freedesktop.login1", + s->path, + "org.freedesktop.login1.Session", + "Activate", + &error, &msg, + ""); + if (ret < 0) { + fprintf(stderr, "%s\n", error.message); + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); + return ret >= 0; +} + +static bool take_control(struct otd *otd) +{ + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + struct otd_session *s = &otd->session; + + ret = sd_bus_call_method(s->bus, + "org.freedesktop.login1", + s->path, + "org.freedesktop.login1.Session", + "TakeControl", + &error, &msg, + "b", false); + if (ret < 0) { + /* Log something */; + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); + return ret >= 0; +} + +static void release_control(struct otd *otd) +{ + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + struct otd_session *s = &otd->session; + + ret = sd_bus_call_method(s->bus, + "org.freedesktop.login1", + s->path, + "org.freedesktop.login1.Session", + "ReleaseControl", + &error, &msg, + ""); + if (ret < 0) { + /* Log something */; + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); +} + +void otd_close_session(struct otd *otd) +{ + release_device(otd, otd->fd); + release_control(otd); + + sd_bus_unref(otd->session.bus); + free(otd->session.id); + free(otd->session.path); + free(otd->session.seat); +} + +bool otd_new_session(struct otd *otd) +{ + int ret; + struct otd_session *s = &otd->session; + + ret = sd_pid_get_session(getpid(), &s->id); + if (ret < 0) { + fprintf(stderr, "Could not get session\n"); + goto error; + } + + ret = sd_session_get_seat(s->id, &s->seat); + if (ret < 0) { + fprintf(stderr, "Could not get seat\n"); + goto error; + } + + // This could be done using asprintf, but I don't want to define _GNU_SOURCE + + const char *fmt = "/org/freedesktop/login1/session/%s"; + int len = snprintf(NULL, 0, fmt, s->id); + + s->path = malloc(len + 1); + if (!s->path) + goto error; + + sprintf(s->path, fmt, s->id); + + ret = sd_bus_open_system(&s->bus); + if (ret < 0) { + fprintf(stderr, "Could not open bus\n"); + goto error; + } + + if (!session_activate(otd)) { + fprintf(stderr, "Could not activate session\n"); + goto error_bus; + } + + if (!take_control(otd)) { + fprintf(stderr, "Could not take control of session\n"); + goto error_bus; + } + + return true; + +error_bus: + sd_bus_unref(s->bus); + +error: + free(s->path); + free(s->id); + free(s->seat); + return false; +} diff --git a/backend/drm/session.h b/backend/drm/session.h new file mode 100644 index 000000000..c21900e9a --- /dev/null +++ b/backend/drm/session.h @@ -0,0 +1,25 @@ +#ifndef SESSION_H +#define SESSION_H + +#include +#include + +struct otd_session { + char *id; + char *path; + char *seat; + + sd_bus *bus; +}; + +struct otd; +bool otd_new_session(struct otd *otd); +void otd_close_session(struct otd *otd); + +int take_device(struct otd *restrict otd, + const char *restrict path, + bool *restrict paused_out); + +void release_device(struct otd *otd, int fd); + +#endif diff --git a/backend/drm/udev.c b/backend/drm/udev.c new file mode 100644 index 000000000..1efa26c21 --- /dev/null +++ b/backend/drm/udev.c @@ -0,0 +1,158 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "otd.h" +#include "udev.h" +#include "session.h" +#include "drm.h" + +static bool device_is_kms(struct otd *otd, struct udev_device *dev) +{ + const char *path = udev_device_get_devnode(dev); + int fd; + + if (!path) + return false; + + fd = take_device(otd, path, &otd->paused); + if (fd < 0) + return false; + + drmModeRes *res = drmModeGetResources(fd); + if (!res) + goto out_fd; + + if (res->count_crtcs <= 0 || res->count_connectors <= 0 || + res->count_encoders <= 0) + goto out_res; + + if (otd->fd >= 0) { + release_device(otd, otd->fd); + free(otd->drm_path); + } + + otd->fd = fd; + otd->drm_path = strdup(path); + + drmModeFreeResources(res); + return true; + +out_res: + drmModeFreeResources(res); +out_fd: + release_device(otd, fd); + return false; +} + +void otd_udev_find_gpu(struct otd *otd) +{ + struct udev *udev = otd->udev; + otd->fd = -1; + + struct udev_enumerate *en = udev_enumerate_new(udev); + if (!en) + return; + + udev_enumerate_add_match_subsystem(en, "drm"); + udev_enumerate_add_match_sysname(en, "card[0-9]*"); + + udev_enumerate_scan_devices(en); + struct udev_list_entry *entry; + udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(en)) { + bool is_boot_vga = false; + + const char *path = udev_list_entry_get_name(entry); + struct udev_device *dev = udev_device_new_from_syspath(udev, path); + if (!dev) + continue; + + const char *seat = udev_device_get_property_value(dev, "ID_SEAT"); + if (!seat) + seat = "seat0"; + if (strcmp(otd->session.seat, seat) != 0) { + udev_device_unref(dev); + continue; + } + + struct udev_device *pci = + udev_device_get_parent_with_subsystem_devtype(dev, + "pci", NULL); + + if (pci) { + const char *id = udev_device_get_sysattr_value(pci, "boot_vga"); + if (id && strcmp(id, "1") == 0) + is_boot_vga = true; + udev_device_unref(pci); + } + + if (!is_boot_vga && otd->fd >= 0) { + udev_device_unref(dev); + continue; + } + + if (!device_is_kms(otd, dev)) { + udev_device_unref(dev); + continue; + } + + if (is_boot_vga) { + break; + } + } + + udev_enumerate_unref(en); +} + +bool otd_udev_start(struct otd *otd) +{ + otd->udev = udev_new(); + if (!otd->udev) + return false; + + otd->mon = udev_monitor_new_from_netlink(otd->udev, "udev"); + if (!otd->mon) { + udev_unref(otd->udev); + return false; + } + + udev_monitor_filter_add_match_subsystem_devtype(otd->mon, "drm", NULL); + udev_monitor_enable_receiving(otd->mon); + + otd->udev_fd = udev_monitor_get_fd(otd->mon); + + return true; +} + +void otd_udev_finish(struct otd *otd) +{ + if (!otd) + return; + + udev_monitor_unref(otd->mon); + udev_unref(otd->udev); +} + +void otd_udev_event(struct otd *otd) +{ + struct udev_device *dev = udev_monitor_receive_device(otd->mon); + if (!dev) + return; + + const char *path = udev_device_get_devnode(dev); + if (!path || strcmp(path, otd->drm_path) != 0) + goto out; + + const char *action = udev_device_get_action(dev); + if (!action || strcmp(action, "change") != 0) + goto out; + + scan_connectors(otd); + +out: + udev_device_unref(dev); +} diff --git a/backend/drm/udev.h b/backend/drm/udev.h new file mode 100644 index 000000000..9bd4c0d01 --- /dev/null +++ b/backend/drm/udev.h @@ -0,0 +1,9 @@ +#ifndef UDEV_H +#define UDEV_H + +bool otd_udev_start(struct otd *otd); +void otd_udev_finish(struct otd *otd); +void otd_udev_find_gpu(struct otd *otd); +void otd_udev_event(struct otd *otd); + +#endif From 95a553dc51029406f9b52227e88ebd9f67b203a5 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Mon, 1 May 2017 15:33:42 +1200 Subject: [PATCH 02/21] Moved headers to the correct place. --- backend/drm/main.c | 160 --------------------- {backend => include/backend}/drm/drm.h | 0 {backend => include/backend}/drm/event.h | 0 {backend => include/backend}/drm/otd.h | 0 {backend => include/backend}/drm/session.h | 0 {backend => include/backend}/drm/udev.h | 0 6 files changed, 160 deletions(-) delete mode 100644 backend/drm/main.c rename {backend => include/backend}/drm/drm.h (100%) rename {backend => include/backend}/drm/event.h (100%) rename {backend => include/backend}/drm/otd.h (100%) rename {backend => include/backend}/drm/session.h (100%) rename {backend => include/backend}/drm/udev.h (100%) diff --git a/backend/drm/main.c b/backend/drm/main.c deleted file mode 100644 index aab11e196..000000000 --- a/backend/drm/main.c +++ /dev/null @@ -1,160 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "otd.h" -#include "drm.h" -#include "event.h" - -// I know this is pretty crappy, -// but it's just for the example's sake -struct { - char *name; - char *mode; -} displays[8]; -int num_displays = 0; - -noreturn void usage(const char *name, int ret) -{ - fprintf(stderr, "usage: %s [-o [-m ]]*\n" - "\n" - " -h \tDisplay this help text\n" - " -o \tWhich diplay to use. e.g. DVI-I-1.\n" - " -m \tWhich mode to use. It must come after an -o option.\n" - " \tMust be either 'preferred', 'current', widthxheight\n" - " \tor widthxheight@rate. Defaults to 'preferred'.\n" - "\n" - "example: %s -o DVI-I-1 -m 1920x1080@60 -o DP-1 -m 1920x1200\n", - name, name); - - exit(ret); -} - -void parse_args(int argc, char *argv[]) -{ - int c; - int i = -1; - - while ((c = getopt(argc, argv, "ho:m:")) != -1) { - switch (c) { - case 'h': - usage(argv[0], 0); - case 'o': - i = num_displays++; - - if (num_displays == 8) { - fprintf(stderr, "Too many displays\n"); - exit(1); - } - - displays[i].name = strdup(optarg); - break; - case 'm': - if (i == -1) { - fprintf(stderr, "A display is required first\n"); - exit(1); - } - - fprintf(stderr, "Assigned '%s' to '%s'\n", optarg, displays[i].name); - displays[i].mode = optarg; - i = -1; - break; - default: - usage(argv[0], 1); - } - } - - // Trailing args - if (optind != argc) { - usage(argv[0], 1); - } -} - -int main(int argc, char *argv[]) -{ - parse_args(argc, argv); - - struct otd *otd = otd_start(); - if (!otd) - return 1; - - float colour[3] = {1.0, 0.0, 0.0}; - int dec = 0; - - struct timespec start, now; - clock_gettime(CLOCK_MONOTONIC, &start); - struct timespec last = start; - - while (clock_gettime(CLOCK_MONOTONIC, &now) == 0 && - now.tv_sec < start.tv_sec + 10) { - - struct otd_event ev; - if (!otd_get_event(otd, &ev)) - continue; - - struct otd_display *disp = ev.display; - - switch (ev.type) { - case OTD_EV_RENDER: - rendering_begin(disp); - - // This is all just calculating the colours. - // It's not particularly important. - - long ms = (now.tv_sec - last.tv_sec) * 1000 + - (now.tv_nsec - last.tv_nsec) / 1000000; - - int inc = (dec + 1) % 3; - - colour[dec] -= ms / 2000.0f; - colour[inc] += ms / 2000.0f; - - if (colour[dec] < 0.0f) { - colour[dec] = 0.0f; - colour[inc] = 1.0f; - - dec = (dec + 1) % 3; - } - - last = now; - - glViewport(0, 0, disp->width, disp->height); - glClearColor(colour[0], colour[1], colour[2], 1.0f); - glClear(GL_COLOR_BUFFER_BIT); - - rendering_end(disp); - break; - case OTD_EV_DISPLAY_REM: - printf("%s removed\n", disp->name); - break; - case OTD_EV_DISPLAY_ADD: - printf("%s added\n", disp->name); - - const char *mode = NULL; - for (int i = 0; i < num_displays; ++i) { - if (strcmp(disp->name, displays[i].name) == 0) { - mode = displays[i].mode; - } - } - if (!mode) - mode = "preferred"; - - if (!modeset_str(otd, ev.display, mode)) { - fprintf(stderr, "Modesetting %s failed\n", disp->name); - goto out; - } - break; - default: - break; - } - } - -out: - otd_finish(otd); -} diff --git a/backend/drm/drm.h b/include/backend/drm/drm.h similarity index 100% rename from backend/drm/drm.h rename to include/backend/drm/drm.h diff --git a/backend/drm/event.h b/include/backend/drm/event.h similarity index 100% rename from backend/drm/event.h rename to include/backend/drm/event.h diff --git a/backend/drm/otd.h b/include/backend/drm/otd.h similarity index 100% rename from backend/drm/otd.h rename to include/backend/drm/otd.h diff --git a/backend/drm/session.h b/include/backend/drm/session.h similarity index 100% rename from backend/drm/session.h rename to include/backend/drm/session.h diff --git a/backend/drm/udev.h b/include/backend/drm/udev.h similarity index 100% rename from backend/drm/udev.h rename to include/backend/drm/udev.h From 9ac46ec5ed6ba67a8c684069f8255384f6acd18b Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Mon, 1 May 2017 15:50:19 +1200 Subject: [PATCH 03/21] Got it to build --- CMake/FindSystemd.cmake | 40 ++++++++++++++++++++++++++++++++++++++++ CMakeLists.txt | 1 + backend/CMakeLists.txt | 6 ++++++ backend/drm/drm.c | 6 +++--- backend/drm/event.c | 8 ++++---- backend/drm/otd.c | 10 +++++----- backend/drm/session.c | 6 ++++-- backend/drm/udev.c | 10 ++++++---- 8 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 CMake/FindSystemd.cmake diff --git a/CMake/FindSystemd.cmake b/CMake/FindSystemd.cmake new file mode 100644 index 000000000..09d601150 --- /dev/null +++ b/CMake/FindSystemd.cmake @@ -0,0 +1,40 @@ +#.rst: +# FindSystemd +# ------- +# +# Find Systemd library +# +# Try to find Systemd library on UNIX systems. The following values are defined +# +# :: +# +# SYSTEMD_FOUND - True if Systemd is available +# SYSTEMD_INCLUDE_DIRS - Include directories for Systemd +# SYSTEMD_LIBRARIES - List of libraries for Systemd +# SYSTEMD_DEFINITIONS - List of definitions for Systemd +# +#============================================================================= +# Copyright (c) 2015 Jari Vetoniemi +# +# Distributed under the OSI-approved BSD License (the "License"); +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= + +include(FeatureSummary) +set_package_properties(Systemd PROPERTIES + URL "http://freedesktop.org/wiki/Software/systemd/" + DESCRIPTION "System and Service Manager") + +find_package(PkgConfig) +pkg_check_modules(PC_SYSTEMD QUIET libsystemd) +find_library(SYSTEMD_LIBRARIES NAMES systemd ${PC_SYSTEMD_LIBRARY_DIRS}) +find_path(SYSTEMD_INCLUDE_DIRS systemd/sd-login.h HINTS ${PC_SYSTEMD_INCLUDE_DIRS}) + +set(SYSTEMD_DEFINITIONS ${PC_SYSTEMD_CFLAGS_OTHER}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SYSTEMD DEFAULT_MSG SYSTEMD_INCLUDE_DIRS SYSTEMD_LIBRARIES) +mark_as_advanced(SYSTEMD_INCLUDE_DIRS SYSTEMD_LIBRARIES SYSTEMD_DEFINITIONS) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd4d99690..30a2c37d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ find_package(DRM REQUIRED) find_package(LibInput REQUIRED) find_package(Udev) find_package(Dbus) +find_package(Systemd) include(Wayland) include(Manpage) diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 830a21584..c962b8eda 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -1,6 +1,7 @@ include_directories( ${PROTOCOLS_INCLUDE_DIRS} ${WAYLAND_INCLUDE_DIR} + ${DRM_INCLUDE_DIRS} ) add_library(wlr-backend @@ -8,6 +9,11 @@ add_library(wlr-backend wayland/registry.c wayland/wl_seat.c wayland/wl_output.c + drm/drm.c + drm/event.c + drm/otd.c + drm/session.c + drm/udev.c ) target_link_libraries(wlr-backend diff --git a/backend/drm/drm.c b/backend/drm/drm.c index bb6359c59..894d8513f 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1,6 +1,6 @@ -#include "otd.h" -#include "drm.h" -#include "event.h" +#include "backend/drm/otd.h" +#include "backend/drm/drm.h" +#include "backend/drm/event.h" #include #include diff --git a/backend/drm/event.c b/backend/drm/event.c index f20cb2828..346795141 100644 --- a/backend/drm/event.c +++ b/backend/drm/event.c @@ -1,7 +1,7 @@ -#include "otd.h" -#include "event.h" -#include "drm.h" -#include "udev.h" +#include "backend/drm/otd.h" +#include "backend/drm/event.h" +#include "backend/drm/drm.h" +#include "backend/drm/udev.h" #include #include diff --git a/backend/drm/otd.c b/backend/drm/otd.c index 3d5345c77..f5960793f 100644 --- a/backend/drm/otd.c +++ b/backend/drm/otd.c @@ -2,11 +2,11 @@ #include #include -#include "otd.h" -#include "drm.h" -#include "event.h" -#include "session.h" -#include "udev.h" +#include "backend/drm/otd.h" +#include "backend/drm/drm.h" +#include "backend/drm/event.h" +#include "backend/drm/session.h" +#include "backend/drm/udev.h" struct otd *otd_start(void) { diff --git a/backend/drm/session.c b/backend/drm/session.c index c845fb275..261c5ac6e 100644 --- a/backend/drm/session.c +++ b/backend/drm/session.c @@ -1,3 +1,5 @@ +#define _POSIX_C_SOURCE 200809L + #include #include #include @@ -9,8 +11,8 @@ #include #include -#include "session.h" -#include "otd.h" +#include "backend/drm/session.h" +#include "backend/drm/otd.h" int take_device(struct otd *restrict otd, const char *restrict path, diff --git a/backend/drm/udev.c b/backend/drm/udev.c index 1efa26c21..5f20a1be8 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -1,3 +1,5 @@ +#define _POSIX_C_SOURCE 200809L + #include #include #include @@ -6,10 +8,10 @@ #include #include -#include "otd.h" -#include "udev.h" -#include "session.h" -#include "drm.h" +#include "backend/drm/otd.h" +#include "backend/drm/udev.h" +#include "backend/drm/session.h" +#include "backend/drm/drm.h" static bool device_is_kms(struct otd *otd, struct udev_device *dev) { From 41a82fd2fcd4759fbb522ffe7e8f6667d6ab945a Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Mon, 1 May 2017 17:49:18 +1200 Subject: [PATCH 04/21] Renaming. --- backend/CMakeLists.txt | 2 +- backend/drm/backend.c | 71 +++++++++++++ backend/drm/drm.c | 188 ++++++++++++++++++---------------- backend/drm/event.c | 54 +++++----- backend/drm/otd.c | 71 ------------- backend/drm/session.c | 83 +++++++-------- backend/drm/udev.c | 79 +++++++------- include/backend/drm/backend.h | 37 +++++++ include/backend/drm/drm.h | 52 ++++++---- include/backend/drm/event.h | 24 +++-- include/backend/drm/otd.h | 44 -------- include/backend/drm/session.h | 19 ++-- include/backend/drm/udev.h | 21 +++- 13 files changed, 395 insertions(+), 350 deletions(-) create mode 100644 backend/drm/backend.c delete mode 100644 backend/drm/otd.c create mode 100644 include/backend/drm/backend.h delete mode 100644 include/backend/drm/otd.h diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index c962b8eda..2d6e734f9 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -9,9 +9,9 @@ add_library(wlr-backend wayland/registry.c wayland/wl_seat.c wayland/wl_output.c + drm/backend.c drm/drm.c drm/event.c - drm/otd.c drm/session.c drm/udev.c ) diff --git a/backend/drm/backend.c b/backend/drm/backend.c new file mode 100644 index 000000000..8c500190f --- /dev/null +++ b/backend/drm/backend.c @@ -0,0 +1,71 @@ +#include +#include +#include + +#include "backend/drm/backend.h" +#include "backend/drm/drm.h" +#include "backend/drm/event.h" +#include "backend/drm/session.h" +#include "backend/drm/udev.h" + +struct wlr_drm_backend *wlr_drm_backend_init(void) +{ + struct wlr_drm_backend *backend = calloc(1, sizeof *backend); + if (!backend) + return NULL; + + if (!wlr_session_start(&backend->session)) { + fprintf(stderr, "Could not create session\n"); + goto error; + } + + if (!wlr_udev_init(&backend->udev)) { + fprintf(stderr, "Could not start udev\n"); + goto error_session; + } + + backend->fd = wlr_udev_find_gpu(&backend->udev, &backend->session); + if (backend->fd == -1) { + fprintf(stderr, "Could not open GPU\n"); + goto error_udev; + } + + if (!wlr_drm_renderer_init(&backend->renderer, backend, backend->fd)) { + fprintf(stderr, "Could not initalise renderer\n"); + goto error_fd; + } + + wlr_drm_scan_connectors(backend); + + return backend; + +error_fd: + wlr_session_release_device(&backend->session, backend->fd); +error_udev: + wlr_udev_free(&backend->udev); +error_session: + wlr_session_end(&backend->session); +error: + free(backend); + return NULL; +} + +void wlr_drm_backend_free(struct wlr_drm_backend *backend) +{ + if (!backend) + return; + + for (size_t i = 0; i < backend->display_len; ++i) { + wlr_drm_display_free(&backend->displays[i]); + } + + wlr_drm_renderer_free(&backend->renderer); + wlr_udev_free(&backend->udev); + wlr_session_release_device(&backend->session, backend->fd); + wlr_session_end(&backend->session); + + free(backend->events); + free(backend->displays); + free(backend); +} + diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 894d8513f..c5b797c32 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1,4 +1,4 @@ -#include "backend/drm/otd.h" +#include "backend/drm/backend.h" #include "backend/drm/drm.h" #include "backend/drm/event.h" @@ -51,7 +51,7 @@ static bool egl_exts() return get_platform_display && create_platform_window_surface; } -bool egl_get_config(EGLDisplay disp, EGLConfig *out) +static bool egl_get_config(EGLDisplay disp, EGLConfig *out) { EGLint count = 0, matched = 0, ret; @@ -85,15 +85,16 @@ bool egl_get_config(EGLDisplay disp, EGLConfig *out) return false; } -bool init_renderer(struct otd *otd) +bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, + struct wlr_drm_backend *backend, int fd) { if (!egl_exts()) { fprintf(stderr, "Could not get EGL extensions\n"); return false; } - otd->gbm = gbm_create_device(otd->fd); - if (!otd->gbm) { + renderer->gbm = gbm_create_device(fd); + if (!renderer->gbm) { fprintf(stderr, "Could not create gbm device: %s\n", strerror(errno)); return false; } @@ -103,103 +104,109 @@ bool init_renderer(struct otd *otd) goto error_gbm; } - otd->egl.disp = get_platform_display(EGL_PLATFORM_GBM_MESA, otd->gbm, NULL); - if (otd->egl.disp == EGL_NO_DISPLAY) { + renderer->egl.disp = get_platform_display(EGL_PLATFORM_GBM_MESA, renderer->gbm, NULL); + if (renderer->egl.disp == EGL_NO_DISPLAY) { fprintf(stderr, "Could not create EGL display\n"); goto error_gbm; } - if (eglInitialize(otd->egl.disp, NULL, NULL) == EGL_FALSE) { + if (eglInitialize(renderer->egl.disp, NULL, NULL) == EGL_FALSE) { fprintf(stderr, "Could not initalise EGL\n"); goto error_egl; } - if (!egl_get_config(otd->egl.disp, &otd->egl.conf)) { + if (!egl_get_config(renderer->egl.disp, &renderer->egl.conf)) { fprintf(stderr, "Could not get EGL config\n"); goto error_egl; } static const EGLint attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE}; - otd->egl.context = eglCreateContext(otd->egl.disp, otd->egl.conf, EGL_NO_CONTEXT, attribs); - if (otd->egl.context == EGL_NO_CONTEXT) { + + renderer->egl.context = eglCreateContext(renderer->egl.disp, + renderer->egl.conf, EGL_NO_CONTEXT, attribs); + + if (renderer->egl.context == EGL_NO_CONTEXT) { fprintf(stderr, "Could not create EGL context\n"); goto error_egl; } + renderer->fd = fd; + renderer->backend = backend; + return true; error_egl: - eglTerminate(otd->egl.disp); + eglTerminate(renderer->egl.disp); eglReleaseThread(); eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); error_gbm: - gbm_device_destroy(otd->gbm); + gbm_device_destroy(renderer->gbm); return false; } -void destroy_renderer(struct otd *otd) +void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) { - if (!otd) + if (!renderer) return; - eglDestroyContext(otd->egl.disp, otd->egl.context); - eglTerminate(otd->egl.disp); + eglDestroyContext(renderer->egl.disp, renderer->egl.context); + eglTerminate(renderer->egl.disp); eglReleaseThread(); eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); - gbm_device_destroy(otd->gbm); + gbm_device_destroy(renderer->gbm); } -void scan_connectors(struct otd *otd) +void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { - drmModeRes *res = drmModeGetResources(otd->fd); + drmModeRes *res = drmModeGetResources(backend->fd); if (!res) return; // I don't know if this needs to be allocated with realloc like this, // as it may not even be possible for the number of connectors to change. // I'll just have to see how DisplayPort MST works with DRM. - if ((size_t)res->count_connectors > otd->display_len) { - struct otd_display *new = realloc(otd->displays, sizeof *new * res->count_connectors); + if ((size_t)res->count_connectors > backend->display_len) { + struct wlr_drm_display *new = realloc(backend->displays, sizeof *new * res->count_connectors); if (!new) goto error; - for (int i = otd->display_len; i < res->count_connectors; ++i) { - new[i] = (struct otd_display) { - .state = OTD_DISP_INVALID, - .otd = otd, + for (int i = backend->display_len; i < res->count_connectors; ++i) { + new[i] = (struct wlr_drm_display) { + .state = DRM_DISP_INVALID, + .renderer = &backend->renderer, }; } - otd->display_len = res->count_connectors; - otd->displays = new; + backend->display_len = res->count_connectors; + backend->displays = new; } for (int i = 0; i < res->count_connectors; ++i) { - struct otd_display *disp = &otd->displays[i]; - drmModeConnector *conn = drmModeGetConnector(otd->fd, res->connectors[i]); + struct wlr_drm_display *disp = &backend->displays[i]; + drmModeConnector *conn = drmModeGetConnector(backend->fd, res->connectors[i]); if (!conn) continue; - if (otd->displays[i].state == OTD_DISP_INVALID) { - disp->state = OTD_DISP_DISCONNECTED; + if (backend->displays[i].state == DRM_DISP_INVALID) { + disp->state = DRM_DISP_DISCONNECTED; disp->connector = res->connectors[i]; snprintf(disp->name, sizeof disp->name, "%s-%"PRIu32, conn_name[conn->connector_type], conn->connector_type_id); } - if (disp->state == OTD_DISP_DISCONNECTED && + if (disp->state == DRM_DISP_DISCONNECTED && conn->connection == DRM_MODE_CONNECTED) { - disp->state = OTD_DISP_NEEDS_MODESET; - event_add(otd, disp, OTD_EV_DISPLAY_ADD); + disp->state = DRM_DISP_NEEDS_MODESET; + wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_ADD); - } else if (disp->state == OTD_DISP_CONNECTED && + } else if (disp->state == DRM_DISP_CONNECTED && conn->connection != DRM_MODE_CONNECTED) { - disp->state = OTD_DISP_DISCONNECTED; - event_add(otd, disp, OTD_EV_DISPLAY_REM); + disp->state = DRM_DISP_DISCONNECTED; + wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); } drmModeFreeConnector(conn); @@ -238,44 +245,49 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) return *id; } -static void init_display_renderer(struct otd *otd, struct otd_display *disp) +static bool display_init_renderer(struct wlr_drm_renderer *renderer, + struct wlr_drm_display *disp) { - disp->gbm = gbm_surface_create(otd->gbm, + disp->renderer = renderer; + + disp->gbm = gbm_surface_create(renderer->gbm, disp->width, disp->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); if (!disp->gbm) - return; + return false; - disp->egl = create_platform_window_surface(otd->egl.disp, otd->egl.conf, + disp->egl = create_platform_window_surface(renderer->egl.disp, renderer->egl.conf, disp->gbm, NULL); if (disp->egl == EGL_NO_SURFACE) - return; + return false; // Render black frame - eglMakeCurrent(otd->egl.disp, disp->egl, disp->egl, otd->egl.context); + eglMakeCurrent(renderer->egl.disp, disp->egl, disp->egl, renderer->egl.context); glViewport(0, 0, disp->width, disp->height); glClearColor(0.0, 0.0, 0.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); - eglSwapBuffers(otd->egl.disp, disp->egl); + eglSwapBuffers(renderer->egl.disp, disp->egl); struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); - uint32_t fb_id = get_fb_for_bo(otd->fd, bo); + uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); - drmModeSetCrtc(otd->fd, disp->crtc, fb_id, 0, 0, + drmModeSetCrtc(renderer->fd, disp->crtc, fb_id, 0, 0, &disp->connector, 1, disp->active_mode); - drmModePageFlip(otd->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); + drmModePageFlip(renderer->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); gbm_surface_release_buffer(disp->gbm, bo); + + return true; } static drmModeModeInfo *select_mode(size_t num_modes, - drmModeModeInfo modes[static num_modes], - drmModeCrtc *old_crtc, - const char *str) + drmModeModeInfo modes[static num_modes], + drmModeCrtc *old_crtc, + const char *str) { if (strcmp(str, "preferred") == 0) return &modes[0]; @@ -315,9 +327,10 @@ static drmModeModeInfo *select_mode(size_t num_modes, return NULL; } -bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str) +bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, + struct wlr_drm_display *disp, const char *str) { - drmModeConnector *conn = drmModeGetConnector(otd->fd, disp->connector); + drmModeConnector *conn = drmModeGetConnector(backend->fd, disp->connector); if (!conn || conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) goto error; @@ -327,9 +340,9 @@ bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str) goto error; memcpy(disp->modes, conn->modes, sizeof *disp->modes * disp->num_modes); - drmModeEncoder *curr_enc = drmModeGetEncoder(otd->fd, conn->encoder_id); + drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); if (curr_enc) { - disp->old_crtc = drmModeGetCrtc(otd->fd, curr_enc->crtc_id); + disp->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); free(curr_enc); } @@ -343,13 +356,13 @@ bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str) disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay, disp->active_mode->vrefresh); - drmModeRes *res = drmModeGetResources(otd->fd); + drmModeRes *res = drmModeGetResources(backend->fd); if (!res) goto error; bool success = false; for (int i = 0; !success && i < conn->count_encoders; ++i) { - drmModeEncoder *enc = drmModeGetEncoder(otd->fd, conn->encoders[i]); + drmModeEncoder *enc = drmModeGetEncoder(backend->fd, conn->encoders[i]); if (!enc) continue; @@ -357,8 +370,8 @@ bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str) if ((enc->possible_crtcs & (1 << j)) == 0) continue; - if ((otd->taken_crtcs & (1 << j)) == 0) { - otd->taken_crtcs |= 1 << j; + if ((backend->taken_crtcs & (1 << j)) == 0) { + backend->taken_crtcs |= 1 << j; disp->crtc = res->crtcs[j]; success = true; @@ -374,45 +387,48 @@ bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str) if (!success) goto error; - disp->state = OTD_DISP_CONNECTED; + disp->state = DRM_DISP_CONNECTED; drmModeFreeConnector(conn); disp->width = disp->active_mode->hdisplay; disp->height = disp->active_mode->vdisplay; - init_display_renderer(otd, disp); + display_init_renderer(&backend->renderer, disp); return true; error: - disp->state = OTD_DISP_DISCONNECTED; + disp->state = DRM_DISP_DISCONNECTED; drmModeFreeConnector(conn); - event_add(otd, disp, OTD_EV_DISPLAY_REM); + wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); return false; } - -void page_flip_handler(int fd, - unsigned seq, - unsigned tv_sec, - unsigned tv_usec, - void *user) +static void page_flip_handler(int fd, + unsigned seq, + unsigned tv_sec, + unsigned tv_usec, + void *user) { - struct otd_display *disp = user; + struct wlr_drm_display *disp = user; disp->pageflip_pending = true; if (!disp->cleanup) - event_add(disp->otd, disp, OTD_EV_RENDER); + wlr_drm_add_event(disp->renderer->backend, disp, DRM_EV_RENDER); } -void destroy_display_renderer(struct otd *otd, struct otd_display *disp) +void wlr_drm_display_free(struct wlr_drm_display *disp) { - if (!otd || !disp || disp->state != OTD_DISP_CONNECTED) + if (!disp || disp->state != DRM_DISP_CONNECTED) return; + struct wlr_drm_renderer *renderer = disp->renderer; + drmModeCrtc *crtc = disp->old_crtc; if (crtc) { + // Wait for exising page flips to finish + drmEventContext event = { .version = DRM_EVENT_CONTEXT_VERSION, .page_flip_handler = page_flip_handler, @@ -420,45 +436,45 @@ void destroy_display_renderer(struct otd *otd, struct otd_display *disp) disp->cleanup = true; while (disp->pageflip_pending) - drmHandleEvent(otd->fd, &event); + drmHandleEvent(renderer->fd, &event); - drmModeSetCrtc(otd->fd, crtc->crtc_id, crtc->buffer_id, + drmModeSetCrtc(renderer->fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y, &disp->connector, 1, &crtc->mode); drmModeFreeCrtc(crtc); } - eglDestroySurface(otd->egl.disp, disp->egl); + eglDestroySurface(renderer->egl.disp, disp->egl); gbm_surface_destroy(disp->gbm); free(disp->modes); } -void get_drm_event(struct otd *otd) +void wlr_drm_event(int fd) { drmEventContext event = { .version = DRM_EVENT_CONTEXT_VERSION, .page_flip_handler = page_flip_handler, }; - drmHandleEvent(otd->fd, &event); + drmHandleEvent(fd, &event); } -void rendering_begin(struct otd_display *disp) +void wlr_drm_display_begin(struct wlr_drm_display *disp) { - struct otd *otd = disp->otd; - eglMakeCurrent(otd->egl.disp, disp->egl, disp->egl, otd->egl.context); + struct wlr_drm_renderer *renderer = disp->renderer; + eglMakeCurrent(renderer->egl.disp, disp->egl, disp->egl, renderer->egl.context); } -void rendering_end(struct otd_display *disp) +void wlr_drm_display_end(struct wlr_drm_display *disp) { - struct otd *otd = disp->otd; - eglSwapBuffers(otd->egl.disp, disp->egl); + struct wlr_drm_renderer *renderer = disp->renderer; + eglSwapBuffers(renderer->egl.disp, disp->egl); struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); - uint32_t fb_id = get_fb_for_bo(otd->fd, bo); + uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); - drmModePageFlip(otd->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); + drmModePageFlip(renderer->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); gbm_surface_release_buffer(disp->gbm, bo); diff --git a/backend/drm/event.c b/backend/drm/event.c index 346795141..db17b5b7f 100644 --- a/backend/drm/event.c +++ b/backend/drm/event.c @@ -1,47 +1,48 @@ -#include "backend/drm/otd.h" -#include "backend/drm/event.h" -#include "backend/drm/drm.h" -#include "backend/drm/udev.h" - #include #include #include -static inline void event_swap(struct otd_event *a, struct otd_event *b) +#include "backend/drm/backend.h" +#include "backend/drm/event.h" +#include "backend/drm/drm.h" +#include "backend/drm/udev.h" + +static inline void event_swap(struct wlr_drm_event *a, struct wlr_drm_event *b) { - struct otd_event tmp = *a; + struct wlr_drm_event tmp = *a; *a = *b; *b = tmp; } -bool otd_get_event(struct otd *otd, struct otd_event *restrict ret) +bool wlr_drm_get_event(struct wlr_drm_backend *backend, + struct wlr_drm_event *restrict ret) { struct pollfd fds[] = { - { .fd = otd->fd, .events = POLLIN }, - { .fd = otd->udev_fd, .events = POLLIN }, + { .fd = backend->fd, .events = POLLIN }, + { .fd = backend->udev.mon_fd, .events = POLLIN }, }; while (poll(fds, 2, 0) > 0) { if (fds[0].revents) - get_drm_event(otd); + wlr_drm_event(backend->fd); if (fds[1].revents) - otd_udev_event(otd); + wlr_udev_event(backend); } - if (otd->event_len == 0) { - ret->type = OTD_EV_NONE; + if (backend->event_len == 0) { + ret->type = DRM_EV_NONE; ret->display = NULL; return false; } - struct otd_event *ev = otd->events; + struct wlr_drm_event *ev = backend->events; // Downheap *ret = ev[0]; - ev[0] = ev[--otd->event_len]; + ev[0] = ev[--backend->event_len]; size_t i = 0; - while (i < otd->event_len / 2) { + while (i < backend->event_len / 2) { size_t left = i * 2 + 1; size_t right = i * 2 + 2; size_t max = (ev[left].type > ev[right].type) ? left : right; @@ -57,27 +58,28 @@ bool otd_get_event(struct otd *otd, struct otd_event *restrict ret) return true; } -bool event_add(struct otd *otd, struct otd_display *disp, enum otd_event_type type) +bool wlr_drm_add_event(struct wlr_drm_backend *backend, + struct wlr_drm_display *disp, enum wlr_drm_event_type type) { - if (type == OTD_EV_NONE) + if (type == DRM_EV_NONE) return true; - if (otd->event_len == otd->event_cap) { - size_t new_size = (otd->event_cap == 0) ? 8 : otd->event_cap * 2; + if (backend->event_len == backend->event_cap) { + size_t new_size = (backend->event_cap == 0) ? 8 : backend->event_cap * 2; - struct otd_event *new = realloc(otd->events, sizeof *new * new_size); + struct wlr_drm_event *new = realloc(backend->events, sizeof *new * new_size); if (!new) { return false; } - otd->event_cap = new_size; - otd->events = new; + backend->event_cap = new_size; + backend->events = new; } - struct otd_event *ev = otd->events; + struct wlr_drm_event *ev = backend->events; // Upheap - size_t i = otd->event_len++; + size_t i = backend->event_len++; ev[i].type = type; ev[i].display = disp; diff --git a/backend/drm/otd.c b/backend/drm/otd.c deleted file mode 100644 index f5960793f..000000000 --- a/backend/drm/otd.c +++ /dev/null @@ -1,71 +0,0 @@ -#include -#include -#include - -#include "backend/drm/otd.h" -#include "backend/drm/drm.h" -#include "backend/drm/event.h" -#include "backend/drm/session.h" -#include "backend/drm/udev.h" - -struct otd *otd_start(void) -{ - struct otd *otd = calloc(1, sizeof *otd); - if (!otd) - return NULL; - - if (!otd_new_session(otd)) { - fprintf(stderr, "Could not create session\n"); - goto error; - } - - if (!otd_udev_start(otd)) { - fprintf(stderr, "Could not start udev\n"); - goto error_session; - } - - otd_udev_find_gpu(otd); - if (otd->fd == -1) { - fprintf(stderr, "Could not open GPU\n"); - goto error_udev; - } - - if (!init_renderer(otd)) { - fprintf(stderr, "Could not initalise renderer\n"); - goto error_fd; - } - - scan_connectors(otd); - - return otd; - -error_fd: - release_device(otd, otd->fd); -error_udev: - otd_udev_finish(otd); -error_session: - otd_close_session(otd); -error: - free(otd); - return NULL; -} - -void otd_finish(struct otd *otd) -{ - if (!otd) - return; - - for (size_t i = 0; i < otd->display_len; ++i) { - destroy_display_renderer(otd, &otd->displays[i]); - } - - destroy_renderer(otd); - otd_close_session(otd); - otd_udev_finish(otd); - - close(otd->fd); - free(otd->events); - free(otd->displays); - free(otd); -} - diff --git a/backend/drm/session.c b/backend/drm/session.c index 261c5ac6e..285f31b9f 100644 --- a/backend/drm/session.c +++ b/backend/drm/session.c @@ -11,18 +11,17 @@ #include #include +#include "backend/drm/backend.h" #include "backend/drm/session.h" -#include "backend/drm/otd.h" -int take_device(struct otd *restrict otd, - const char *restrict path, - bool *restrict paused_out) +int wlr_session_take_device(struct wlr_session *restrict session, + const char *restrict path, + bool *restrict paused_out) { int ret; int fd = -1; sd_bus_message *msg = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; - struct otd_session *s = &otd->session; struct stat st; if (stat(path, &st) < 0) { @@ -30,9 +29,9 @@ int take_device(struct otd *restrict otd, return -1; } - ret = sd_bus_call_method(s->bus, + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", - s->path, + session->path, "org.freedesktop.login1.Session", "TakeDevice", &error, &msg, @@ -62,12 +61,11 @@ error: return fd; } -void release_device(struct otd *otd, int fd) +void wlr_session_release_device(struct wlr_session *session, int fd) { int ret; sd_bus_message *msg = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; - struct otd_session *s = &otd->session; struct stat st; if (fstat(fd, &st) < 0) { @@ -75,9 +73,9 @@ void release_device(struct otd *otd, int fd) return; } - ret = sd_bus_call_method(s->bus, + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", - s->path, + session->path, "org.freedesktop.login1.Session", "ReleaseDevice", &error, &msg, @@ -90,16 +88,15 @@ void release_device(struct otd *otd, int fd) sd_bus_message_unref(msg); } -static bool session_activate(struct otd *otd) +static bool session_activate(struct wlr_session *session) { int ret; sd_bus_message *msg = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; - struct otd_session *s = &otd->session; - ret = sd_bus_call_method(s->bus, + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", - s->path, + session->path, "org.freedesktop.login1.Session", "Activate", &error, &msg, @@ -113,16 +110,15 @@ static bool session_activate(struct otd *otd) return ret >= 0; } -static bool take_control(struct otd *otd) +static bool take_control(struct wlr_session *session) { int ret; sd_bus_message *msg = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; - struct otd_session *s = &otd->session; - ret = sd_bus_call_method(s->bus, + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", - s->path, + session->path, "org.freedesktop.login1.Session", "TakeControl", &error, &msg, @@ -136,16 +132,15 @@ static bool take_control(struct otd *otd) return ret >= 0; } -static void release_control(struct otd *otd) +static void release_control(struct wlr_session *session) { int ret; sd_bus_message *msg = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; - struct otd_session *s = &otd->session; - ret = sd_bus_call_method(s->bus, + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", - s->path, + session->path, "org.freedesktop.login1.Session", "ReleaseControl", &error, &msg, @@ -158,29 +153,27 @@ static void release_control(struct otd *otd) sd_bus_message_unref(msg); } -void otd_close_session(struct otd *otd) +void wlr_session_end(struct wlr_session *session) { - release_device(otd, otd->fd); - release_control(otd); + release_control(session); - sd_bus_unref(otd->session.bus); - free(otd->session.id); - free(otd->session.path); - free(otd->session.seat); + sd_bus_unref(session->bus); + free(session->id); + free(session->path); + free(session->seat); } -bool otd_new_session(struct otd *otd) +bool wlr_session_start(struct wlr_session *session) { int ret; - struct otd_session *s = &otd->session; - ret = sd_pid_get_session(getpid(), &s->id); + ret = sd_pid_get_session(getpid(), &session->id); if (ret < 0) { fprintf(stderr, "Could not get session\n"); goto error; } - ret = sd_session_get_seat(s->id, &s->seat); + ret = sd_session_get_seat(session->id, &session->seat); if (ret < 0) { fprintf(stderr, "Could not get seat\n"); goto error; @@ -189,26 +182,26 @@ bool otd_new_session(struct otd *otd) // This could be done using asprintf, but I don't want to define _GNU_SOURCE const char *fmt = "/org/freedesktop/login1/session/%s"; - int len = snprintf(NULL, 0, fmt, s->id); + int len = snprintf(NULL, 0, fmt, session->id); - s->path = malloc(len + 1); - if (!s->path) + session->path = malloc(len + 1); + if (!session->path) goto error; - sprintf(s->path, fmt, s->id); + sprintf(session->path, fmt, session->id); - ret = sd_bus_open_system(&s->bus); + ret = sd_bus_open_system(&session->bus); if (ret < 0) { fprintf(stderr, "Could not open bus\n"); goto error; } - if (!session_activate(otd)) { + if (!session_activate(session)) { fprintf(stderr, "Could not activate session\n"); goto error_bus; } - if (!take_control(otd)) { + if (!take_control(session)) { fprintf(stderr, "Could not take control of session\n"); goto error_bus; } @@ -216,11 +209,11 @@ bool otd_new_session(struct otd *otd) return true; error_bus: - sd_bus_unref(s->bus); + sd_bus_unref(session->bus); error: - free(s->path); - free(s->id); - free(s->seat); + free(session->path); + free(session->id); + free(session->seat); return false; } diff --git a/backend/drm/udev.c b/backend/drm/udev.c index 5f20a1be8..c54403030 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -8,12 +8,15 @@ #include #include -#include "backend/drm/otd.h" +#include "backend/drm/backend.h" #include "backend/drm/udev.h" #include "backend/drm/session.h" #include "backend/drm/drm.h" -static bool device_is_kms(struct otd *otd, struct udev_device *dev) +static bool device_is_kms(struct wlr_udev *udev, + struct wlr_session *session, + struct udev_device *dev, + int *fd_out) { const char *path = udev_device_get_devnode(dev); int fd; @@ -21,7 +24,7 @@ static bool device_is_kms(struct otd *otd, struct udev_device *dev) if (!path) return false; - fd = take_device(otd, path, &otd->paused); + fd = wlr_session_take_device(session, path, NULL); if (fd < 0) return false; @@ -33,13 +36,13 @@ static bool device_is_kms(struct otd *otd, struct udev_device *dev) res->count_encoders <= 0) goto out_res; - if (otd->fd >= 0) { - release_device(otd, otd->fd); - free(otd->drm_path); + if (*fd_out >= 0) { + wlr_session_release_device(session, *fd_out); + free(udev->drm_path); } - otd->fd = fd; - otd->drm_path = strdup(path); + *fd_out = fd; + udev->drm_path = strdup(path); drmModeFreeResources(res); return true; @@ -47,18 +50,17 @@ static bool device_is_kms(struct otd *otd, struct udev_device *dev) out_res: drmModeFreeResources(res); out_fd: - release_device(otd, fd); + wlr_session_release_device(session, fd); return false; } -void otd_udev_find_gpu(struct otd *otd) +int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) { - struct udev *udev = otd->udev; - otd->fd = -1; + int fd = -1; - struct udev_enumerate *en = udev_enumerate_new(udev); + struct udev_enumerate *en = udev_enumerate_new(udev->udev); if (!en) - return; + return -1; udev_enumerate_add_match_subsystem(en, "drm"); udev_enumerate_add_match_sysname(en, "card[0-9]*"); @@ -69,14 +71,14 @@ void otd_udev_find_gpu(struct otd *otd) bool is_boot_vga = false; const char *path = udev_list_entry_get_name(entry); - struct udev_device *dev = udev_device_new_from_syspath(udev, path); + struct udev_device *dev = udev_device_new_from_syspath(udev->udev, path); if (!dev) continue; const char *seat = udev_device_get_property_value(dev, "ID_SEAT"); if (!seat) seat = "seat0"; - if (strcmp(otd->session.seat, seat) != 0) { + if (strcmp(session->seat, seat) != 0) { udev_device_unref(dev); continue; } @@ -92,12 +94,12 @@ void otd_udev_find_gpu(struct otd *otd) udev_device_unref(pci); } - if (!is_boot_vga && otd->fd >= 0) { + if (!is_boot_vga && fd >= 0) { udev_device_unref(dev); continue; } - if (!device_is_kms(otd, dev)) { + if (!device_is_kms(udev, session, dev, &fd)) { udev_device_unref(dev); continue; } @@ -108,52 +110,59 @@ void otd_udev_find_gpu(struct otd *otd) } udev_enumerate_unref(en); + + return fd; } -bool otd_udev_start(struct otd *otd) +bool wlr_udev_init(struct wlr_udev *udev) { - otd->udev = udev_new(); - if (!otd->udev) + udev->udev = udev_new(); + if (!udev->udev) return false; - otd->mon = udev_monitor_new_from_netlink(otd->udev, "udev"); - if (!otd->mon) { - udev_unref(otd->udev); + udev->mon = udev_monitor_new_from_netlink(udev->udev, "udev"); + if (!udev->mon) { + udev_unref(udev->udev); return false; } - udev_monitor_filter_add_match_subsystem_devtype(otd->mon, "drm", NULL); - udev_monitor_enable_receiving(otd->mon); + udev_monitor_filter_add_match_subsystem_devtype(udev->mon, "drm", NULL); + udev_monitor_enable_receiving(udev->mon); - otd->udev_fd = udev_monitor_get_fd(otd->mon); + udev->mon_fd = udev_monitor_get_fd(udev->mon); + udev->drm_path = NULL; return true; } -void otd_udev_finish(struct otd *otd) +void wlr_udev_free(struct wlr_udev *udev) + { - if (!otd) + if (!udev) return; - udev_monitor_unref(otd->mon); - udev_unref(otd->udev); + udev_monitor_unref(udev->mon); + udev_unref(udev->udev); + free(udev->drm_path); } -void otd_udev_event(struct otd *otd) +void wlr_udev_event(struct wlr_drm_backend *backend) { - struct udev_device *dev = udev_monitor_receive_device(otd->mon); + struct wlr_udev *udev = &backend->udev; + + struct udev_device *dev = udev_monitor_receive_device(udev->mon); if (!dev) return; const char *path = udev_device_get_devnode(dev); - if (!path || strcmp(path, otd->drm_path) != 0) + if (!path || strcmp(path, udev->drm_path) != 0) goto out; const char *action = udev_device_get_action(dev); if (!action || strcmp(action, "change") != 0) goto out; - scan_connectors(otd); + wlr_drm_scan_connectors(backend); out: udev_device_unref(dev); diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h new file mode 100644 index 000000000..caa18bcce --- /dev/null +++ b/include/backend/drm/backend.h @@ -0,0 +1,37 @@ +#ifndef DRM_BACKEND_H +#define DRM_BACKEND_H + +#include +#include +#include +#include +#include + +#include "session.h" +#include "udev.h" +#include "event.h" +#include "drm.h" + +struct wlr_drm_backend { + int fd; + bool paused; + + // Priority Queue (Max-heap) + size_t event_cap; + size_t event_len; + struct wlr_drm_event *events; + + size_t display_len; + struct wlr_drm_display *displays; + + uint32_t taken_crtcs; + + struct wlr_drm_renderer renderer; + struct wlr_session session; + struct wlr_udev udev; +}; + +struct wlr_drm_backend *wlr_drm_backend_init(void); +void wlr_drm_backend_free(struct wlr_drm_backend *backend); + +#endif diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 8744b4400..bd3d41055 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -7,17 +7,35 @@ #include #include -enum otd_display_state { - OTD_DISP_INVALID, - OTD_DISP_DISCONNECTED, - OTD_DISP_NEEDS_MODESET, - OTD_DISP_CONNECTED, +struct wlr_drm_renderer { + int fd; + + // Currently here so that rendering has access to the event queue. + // Ideally this is will be removed later once the way events are + // handled is changed. + struct wlr_drm_backend *backend; + + struct gbm_device *gbm; + struct { + EGLDisplay disp; + EGLConfig conf; + EGLContext context; + } egl; }; -struct otd_display { - struct otd *otd; +bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, + struct wlr_drm_backend *backend, int fd); +void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer); - enum otd_display_state state; +enum wlr_drm_display_state { + DRM_DISP_INVALID, + DRM_DISP_DISCONNECTED, + DRM_DISP_NEEDS_MODESET, + DRM_DISP_CONNECTED, +}; + +struct wlr_drm_display { + enum wlr_drm_display_state state; uint32_t connector; char name[16]; @@ -31,24 +49,22 @@ struct otd_display { uint32_t crtc; drmModeCrtc *old_crtc; + struct wlr_drm_renderer *renderer; struct gbm_surface *gbm; EGLSurface *egl; - uint32_t fb_id; bool pageflip_pending; bool cleanup; }; -bool init_renderer(struct otd *otd); -void destroy_renderer(struct otd *otd); +bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, + struct wlr_drm_display *disp, const char *str); +void wlr_drm_display_free(struct wlr_drm_display *disp); -void scan_connectors(struct otd *otd); -bool modeset_str(struct otd *otd, struct otd_display *disp, const char *str); -void destroy_display_renderer(struct otd *otd, struct otd_display *disp); +void wlr_drm_display_begin(struct wlr_drm_display *disp); +void wlr_drm_display_end(struct wlr_drm_display *disp); -void get_drm_event(struct otd *otd); - -void rendering_begin(struct otd_display *disp); -void rendering_end(struct otd_display *disp); +void wlr_drm_scan_connectors(struct wlr_drm_backend *backend); +void wlr_drm_event(int fd); #endif diff --git a/include/backend/drm/event.h b/include/backend/drm/event.h index fc4f6f9aa..2155bd320 100644 --- a/include/backend/drm/event.h +++ b/include/backend/drm/event.h @@ -2,20 +2,24 @@ #define EVENT_H #include +#include "drm.h" -enum otd_event_type { - OTD_EV_NONE, - OTD_EV_RENDER, - OTD_EV_DISPLAY_REM, - OTD_EV_DISPLAY_ADD, +enum wlr_drm_event_type { + DRM_EV_NONE, + DRM_EV_RENDER, + DRM_EV_DISPLAY_REM, + DRM_EV_DISPLAY_ADD, }; -struct otd_event { - enum otd_event_type type; - struct otd_display *display; +struct wlr_drm_event { + enum wlr_drm_event_type type; + struct wlr_drm_display *display; }; -bool otd_get_event(struct otd *otd, struct otd_event *restrict ret); -bool event_add(struct otd *otd, struct otd_display *disp, enum otd_event_type type); +struct wlr_drm_backend; +bool wlr_drm_get_event(struct wlr_drm_backend *backend, + struct wlr_drm_event *restrict ret); +bool wlr_drm_add_event(struct wlr_drm_backend *backend, + struct wlr_drm_display *disp, enum wlr_drm_event_type type); #endif diff --git a/include/backend/drm/otd.h b/include/backend/drm/otd.h deleted file mode 100644 index eef0e9916..000000000 --- a/include/backend/drm/otd.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef LIBOTD_H -#define LIBOTD_H - -#include -#include -#include -#include -#include - -#include "session.h" - -struct otd { - int fd; - bool paused; - - // Priority Queue (Max-heap) - size_t event_cap; - size_t event_len; - struct otd_event *events; - - size_t display_len; - struct otd_display *displays; - - uint32_t taken_crtcs; - - struct gbm_device *gbm; - struct { - EGLDisplay disp; - EGLConfig conf; - EGLContext context; - } egl; - - struct otd_session session; - - struct udev *udev; - struct udev_monitor *mon; - int udev_fd; - char *drm_path; -}; - -struct otd *otd_start(void); -void otd_finish(struct otd *otd); - -#endif diff --git a/include/backend/drm/session.h b/include/backend/drm/session.h index c21900e9a..6936b19ad 100644 --- a/include/backend/drm/session.h +++ b/include/backend/drm/session.h @@ -4,22 +4,21 @@ #include #include -struct otd_session { +struct wlr_session { + sd_bus *bus; + char *id; char *path; char *seat; - - sd_bus *bus; }; -struct otd; -bool otd_new_session(struct otd *otd); -void otd_close_session(struct otd *otd); +bool wlr_session_start(struct wlr_session *session); +void wlr_session_end(struct wlr_session *session); -int take_device(struct otd *restrict otd, - const char *restrict path, - bool *restrict paused_out); +int wlr_session_take_device(struct wlr_session *restrict session, + const char *restrict path, + bool *restrict paused_out); -void release_device(struct otd *otd, int fd); +void wlr_session_release_device(struct wlr_session *session, int fd); #endif diff --git a/include/backend/drm/udev.h b/include/backend/drm/udev.h index 9bd4c0d01..6b10c9ec1 100644 --- a/include/backend/drm/udev.h +++ b/include/backend/drm/udev.h @@ -1,9 +1,22 @@ #ifndef UDEV_H #define UDEV_H -bool otd_udev_start(struct otd *otd); -void otd_udev_finish(struct otd *otd); -void otd_udev_find_gpu(struct otd *otd); -void otd_udev_event(struct otd *otd); +#include + +#include "backend/drm/session.h" + +struct wlr_udev { + struct udev *udev; + struct udev_monitor *mon; + int mon_fd; + char *drm_path; +}; + +bool wlr_udev_init(struct wlr_udev *udev); +void wlr_udev_free(struct wlr_udev *udev); +int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session); + +struct wlr_drm_backend; +void wlr_udev_event(struct wlr_drm_backend *backend); #endif From 562d43a5ecc2f7f4af3ed6924d52f87e3cc018c2 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 2 May 2017 13:00:25 +1200 Subject: [PATCH 05/21] Changed logging. --- backend/drm/backend.c | 17 ++-- backend/drm/drm.c | 168 +++++++++++++++++++++++++++++--------- backend/drm/session.c | 50 ++++++------ backend/drm/udev.c | 13 ++- include/backend/drm/drm.h | 2 +- 5 files changed, 176 insertions(+), 74 deletions(-) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 8c500190f..da7ca1e49 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -1,37 +1,42 @@ #include #include #include +#include +#include #include "backend/drm/backend.h" #include "backend/drm/drm.h" #include "backend/drm/event.h" #include "backend/drm/session.h" #include "backend/drm/udev.h" +#include "common/log.h" struct wlr_drm_backend *wlr_drm_backend_init(void) { struct wlr_drm_backend *backend = calloc(1, sizeof *backend); - if (!backend) + if (!backend) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); return NULL; + } if (!wlr_session_start(&backend->session)) { - fprintf(stderr, "Could not create session\n"); + wlr_log(L_ERROR, "Failed to start session"); goto error; } if (!wlr_udev_init(&backend->udev)) { - fprintf(stderr, "Could not start udev\n"); + wlr_log(L_ERROR, "Failed to start udev"); goto error_session; } backend->fd = wlr_udev_find_gpu(&backend->udev, &backend->session); if (backend->fd == -1) { - fprintf(stderr, "Could not open GPU\n"); + wlr_log(L_ERROR, "Failed to open DRM device"); goto error_udev; } if (!wlr_drm_renderer_init(&backend->renderer, backend, backend->fd)) { - fprintf(stderr, "Could not initalise renderer\n"); + wlr_log(L_ERROR, "Failed to initialize renderer"); goto error_fd; } @@ -56,7 +61,7 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) return; for (size_t i = 0; i < backend->display_len; ++i) { - wlr_drm_display_free(&backend->displays[i]); + wlr_drm_display_free(&backend->displays[i], true); } wlr_drm_renderer_free(&backend->renderer); diff --git a/backend/drm/drm.c b/backend/drm/drm.c index c5b797c32..94d79e5ce 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1,7 +1,3 @@ -#include "backend/drm/backend.h" -#include "backend/drm/drm.h" -#include "backend/drm/event.h" - #include #include #include @@ -16,6 +12,11 @@ #include #include +#include "backend/drm/backend.h" +#include "backend/drm/drm.h" +#include "backend/drm/event.h" +#include "common/log.h" + static const char *conn_name[] = { [DRM_MODE_CONNECTOR_Unknown] = "Unknown", [DRM_MODE_CONNECTOR_VGA] = "VGA", @@ -36,6 +37,44 @@ static const char *conn_name[] = { [DRM_MODE_CONNECTOR_DSI] = "DSI", }; +static const char *egl_error(void) +{ + switch (eglGetError()) { + case EGL_SUCCESS: + return "Success"; + case EGL_NOT_INITIALIZED: + return "Not initialized"; + case EGL_BAD_ACCESS: + return "Bad access"; + case EGL_BAD_ALLOC: + return "Bad alloc"; + case EGL_BAD_ATTRIBUTE: + return "Bad attribute"; + case EGL_BAD_CONTEXT: + return "Bad Context"; + case EGL_BAD_CONFIG: + return "Bad Config"; + case EGL_BAD_CURRENT_SURFACE: + return "Bad current surface"; + case EGL_BAD_DISPLAY: + return "Bad display"; + case EGL_BAD_SURFACE: + return "Bad surface"; + case EGL_BAD_MATCH: + return "Bad match"; + case EGL_BAD_PARAMETER: + return "Bad parameter"; + case EGL_BAD_NATIVE_PIXMAP: + return "Bad native pixmap"; + case EGL_BAD_NATIVE_WINDOW: + return "Bad native window"; + case EGL_CONTEXT_LOST: + return "Context lost"; + default: + return "Unknown"; + } +} + // EGL extensions PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display; PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface; @@ -45,10 +84,20 @@ static bool egl_exts() get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC) eglGetProcAddress("eglGetPlatformDisplayEXT"); + if (!get_platform_display) { + wlr_log(L_ERROR, "Failed to load EGL extension 'eglGetPlatformDisplayEXT'"); + return false; + } + create_platform_window_surface = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); - return get_platform_display && create_platform_window_surface; + if (!get_platform_display) { + wlr_log(L_ERROR, "Failed to load EGL extension 'eglCreatePlatformWindowSurfaceEXT'"); + return false; + } + + return true; } static bool egl_get_config(EGLDisplay disp, EGLConfig *out) @@ -88,35 +137,33 @@ static bool egl_get_config(EGLDisplay disp, EGLConfig *out) bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, struct wlr_drm_backend *backend, int fd) { - if (!egl_exts()) { - fprintf(stderr, "Could not get EGL extensions\n"); + if (!egl_exts()) return false; - } renderer->gbm = gbm_create_device(fd); if (!renderer->gbm) { - fprintf(stderr, "Could not create gbm device: %s\n", strerror(errno)); + wlr_log(L_ERROR, "Failed to create GBM device: %s", strerror(errno)); return false; } if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) { - fprintf(stderr, "Could not bind GLES3 API\n"); + wlr_log(L_ERROR, "Failed to bind to the OpenGL ES API: %s", egl_error()); goto error_gbm; } renderer->egl.disp = get_platform_display(EGL_PLATFORM_GBM_MESA, renderer->gbm, NULL); if (renderer->egl.disp == EGL_NO_DISPLAY) { - fprintf(stderr, "Could not create EGL display\n"); + wlr_log(L_ERROR, "Failed to create EGL display: %s", egl_error()); goto error_gbm; } if (eglInitialize(renderer->egl.disp, NULL, NULL) == EGL_FALSE) { - fprintf(stderr, "Could not initalise EGL\n"); + wlr_log(L_ERROR, "Failed to initialize EGL: %s", egl_error()); goto error_egl; } if (!egl_get_config(renderer->egl.disp, &renderer->egl.conf)) { - fprintf(stderr, "Could not get EGL config\n"); + wlr_log(L_ERROR, "Failed to get EGL config"); goto error_egl; } @@ -126,7 +173,7 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, renderer->egl.conf, EGL_NO_CONTEXT, attribs); if (renderer->egl.context == EGL_NO_CONTEXT) { - fprintf(stderr, "Could not create EGL context\n"); + wlr_log(L_ERROR, "Failed to create EGL context: %s", egl_error()); goto error_egl; } @@ -162,16 +209,20 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { drmModeRes *res = drmModeGetResources(backend->fd); - if (!res) + if (!res) { + wlr_log(L_ERROR, "Failed to get DRM resources"); return; + } // I don't know if this needs to be allocated with realloc like this, // as it may not even be possible for the number of connectors to change. // I'll just have to see how DisplayPort MST works with DRM. if ((size_t)res->count_connectors > backend->display_len) { struct wlr_drm_display *new = realloc(backend->displays, sizeof *new * res->count_connectors); - if (!new) + if (!new) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); goto error; + } for (int i = backend->display_len; i < res->count_connectors; ++i) { new[i] = (struct wlr_drm_display) { @@ -206,6 +257,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) } else if (disp->state == DRM_DISP_CONNECTED && conn->connection != DRM_MODE_CONNECTED) { disp->state = DRM_DISP_DISCONNECTED; + wlr_drm_display_free(disp, false); wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); } @@ -234,8 +286,10 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) return *id; id = calloc(1, sizeof *id); - if (!id) + if (!id) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); return 0; + } drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32, gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id); @@ -254,13 +308,19 @@ static bool display_init_renderer(struct wlr_drm_renderer *renderer, disp->width, disp->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); - if (!disp->gbm) + if (!disp->gbm) { + wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", disp->name, + strerror(errno)); return false; + } disp->egl = create_platform_window_surface(renderer->egl.disp, renderer->egl.conf, disp->gbm, NULL); - if (disp->egl == EGL_NO_SURFACE) + if (disp->egl == EGL_NO_SURFACE) { + wlr_log(L_ERROR, "Failed to create EGL surface for %s: %s", disp->name, + egl_error()); return false; + } // Render black frame @@ -294,7 +354,7 @@ static drmModeModeInfo *select_mode(size_t num_modes, if (strcmp(str, "current") == 0) { if (!old_crtc) { - fprintf(stderr, "Display does not have currently configured mode\n"); + wlr_log(L_ERROR, "Display does not have currently configured mode"); return NULL; } @@ -313,7 +373,7 @@ static drmModeModeInfo *select_mode(size_t num_modes, int ret; if ((ret = sscanf(str, "%ux%u@%u", &width, &height, &rate)) != 2 && ret != 3) { - fprintf(stderr, "Invalid modesetting string\n"); + wlr_log(L_ERROR, "Invalid modesetting string '%s'", str); return NULL; } @@ -324,22 +384,40 @@ static drmModeModeInfo *select_mode(size_t num_modes, return &modes[i]; } + wlr_log(L_ERROR, "Unable to find mode %ux%u@%u", width, height, rate); return NULL; } bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, struct wlr_drm_display *disp, const char *str) { + wlr_log(L_INFO, "Modesetting %s with '%s'", disp->name, str); + drmModeConnector *conn = drmModeGetConnector(backend->fd, disp->connector); - if (!conn || conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) + 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", disp->name); + goto error; + } disp->num_modes = conn->count_modes; disp->modes = malloc(sizeof *disp->modes * disp->num_modes); - if (!disp->modes) + if (!disp->modes) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); goto error; + } memcpy(disp->modes, conn->modes, sizeof *disp->modes * disp->num_modes); + wlr_log(L_INFO, "Detected modes:"); + for (size_t i = 0; i < disp->num_modes; ++i) + wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32, + disp->modes[i].hdisplay, disp->modes[i].vdisplay, + disp->modes[i].vrefresh); + drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); if (curr_enc) { disp->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); @@ -348,17 +426,15 @@ bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, disp->active_mode = select_mode(disp->num_modes, disp->modes, disp->old_crtc, str); if (!disp->active_mode) { - fprintf(stderr, "Could not find mode '%s' for %s\n", str, disp->name); + wlr_log(L_ERROR, "Failed to configure %s", disp->name); goto error; } - fprintf(stderr, "Configuring %s with mode %ux%u@%u\n", - disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay, - disp->active_mode->vrefresh); - drmModeRes *res = drmModeGetResources(backend->fd); - if (!res) + 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) { @@ -384,21 +460,33 @@ bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, drmModeFreeResources(res); - if (!success) + if (!success) { + wlr_log(L_ERROR, "Failed to find CRTC for %s", disp->name); goto error; + } disp->state = DRM_DISP_CONNECTED; - drmModeFreeConnector(conn); disp->width = disp->active_mode->hdisplay; disp->height = disp->active_mode->vdisplay; - display_init_renderer(&backend->renderer, disp); + if (!display_init_renderer(&backend->renderer, disp)) { + wlr_log(L_ERROR, "Failed to initalise renderer for %s", disp->name); + goto error; + } + + drmModeFreeConnector(conn); + + wlr_log(L_INFO, "Configuring %s with mode %"PRIu16"x%"PRIu16"@%"PRIu32"\n", + disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay, + disp->active_mode->vrefresh); return true; + error: disp->state = DRM_DISP_DISCONNECTED; drmModeFreeConnector(conn); + free(disp->modes); wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); @@ -418,13 +506,22 @@ static void page_flip_handler(int fd, wlr_drm_add_event(disp->renderer->backend, disp, DRM_EV_RENDER); } -void wlr_drm_display_free(struct wlr_drm_display *disp) +void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore) { if (!disp || disp->state != DRM_DISP_CONNECTED) return; struct wlr_drm_renderer *renderer = disp->renderer; + eglDestroySurface(renderer->egl.disp, disp->egl); + gbm_surface_destroy(disp->gbm); + + free(disp->modes); + disp->state = DRM_DISP_DISCONNECTED; + + if (!restore) + return; + drmModeCrtc *crtc = disp->old_crtc; if (crtc) { // Wait for exising page flips to finish @@ -443,11 +540,6 @@ void wlr_drm_display_free(struct wlr_drm_display *disp) 1, &crtc->mode); drmModeFreeCrtc(crtc); } - - eglDestroySurface(renderer->egl.disp, disp->egl); - gbm_surface_destroy(disp->gbm); - - free(disp->modes); } void wlr_drm_event(int fd) diff --git a/backend/drm/session.c b/backend/drm/session.c index 285f31b9f..49223334c 100644 --- a/backend/drm/session.c +++ b/backend/drm/session.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -13,6 +14,7 @@ #include "backend/drm/backend.h" #include "backend/drm/session.h" +#include "common/log.h" int wlr_session_take_device(struct wlr_session *restrict session, const char *restrict path, @@ -25,7 +27,7 @@ int wlr_session_take_device(struct wlr_session *restrict session, struct stat st; if (stat(path, &st) < 0) { - fprintf(stderr, "Failed to stat '%s'\n", path); + wlr_log(L_ERROR, "Failed to stat '%s'", path); return -1; } @@ -37,20 +39,26 @@ int wlr_session_take_device(struct wlr_session *restrict session, &error, &msg, "uu", major(st.st_rdev), minor(st.st_rdev)); if (ret < 0) { - fprintf(stderr, "%s\n", error.message); + wlr_log(L_ERROR, "Failed to take device '%s': %s", path, error.message); goto error; } int paused = 0; ret = sd_bus_message_read(msg, "hb", &fd, &paused); if (ret < 0) { - fprintf(stderr, "%s\n", strerror(-ret)); + wlr_log(L_ERROR, "Failed to parse DBus response for '%s': %s", + path, strerror(-ret)); goto error; } // The original fd seem to be closed when the message is freed // so we just clone it. fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); + if (fd == -1) { + wlr_log(L_ERROR, "Failed to clone file descriptor for '%s': %s", + path, strerror(errno)); + goto error; + } if (paused_out) *paused_out = paused; @@ -69,7 +77,7 @@ void wlr_session_release_device(struct wlr_session *session, int fd) struct stat st; if (fstat(fd, &st) < 0) { - fprintf(stderr, "Could not stat fd %d\n", fd); + wlr_log(L_ERROR, "Failed to stat device '%d'", fd); return; } @@ -80,9 +88,8 @@ void wlr_session_release_device(struct wlr_session *session, int fd) "ReleaseDevice", &error, &msg, "uu", major(st.st_rdev), minor(st.st_rdev)); - if (ret < 0) { - /* Log something */; - } + if (ret < 0) + wlr_log(L_ERROR, "Failed to release device '%d'", fd); sd_bus_error_free(&error); sd_bus_message_unref(msg); @@ -101,9 +108,8 @@ static bool session_activate(struct wlr_session *session) "Activate", &error, &msg, ""); - if (ret < 0) { - fprintf(stderr, "%s\n", error.message); - } + if (ret < 0) + wlr_log(L_ERROR, "Failed to activate session"); sd_bus_error_free(&error); sd_bus_message_unref(msg); @@ -123,9 +129,8 @@ static bool take_control(struct wlr_session *session) "TakeControl", &error, &msg, "b", false); - if (ret < 0) { - /* Log something */; - } + if (ret < 0) + wlr_log(L_ERROR, "Failed to take control of session"); sd_bus_error_free(&error); sd_bus_message_unref(msg); @@ -145,9 +150,8 @@ static void release_control(struct wlr_session *session) "ReleaseControl", &error, &msg, ""); - if (ret < 0) { - /* Log something */; - } + if (ret < 0) + wlr_log(L_ERROR, "Failed to release control of session"); sd_bus_error_free(&error); sd_bus_message_unref(msg); @@ -169,13 +173,13 @@ bool wlr_session_start(struct wlr_session *session) ret = sd_pid_get_session(getpid(), &session->id); if (ret < 0) { - fprintf(stderr, "Could not get session\n"); + wlr_log(L_ERROR, "Failed to get session id: %s", strerror(-ret)); goto error; } ret = sd_session_get_seat(session->id, &session->seat); if (ret < 0) { - fprintf(stderr, "Could not get seat\n"); + wlr_log(L_ERROR, "Failed to get seat id: %s", strerror(-ret)); goto error; } @@ -192,19 +196,15 @@ bool wlr_session_start(struct wlr_session *session) ret = sd_bus_open_system(&session->bus); if (ret < 0) { - fprintf(stderr, "Could not open bus\n"); + wlr_log(L_ERROR, "Failed to open DBus connection: %s", strerror(-ret)); goto error; } - if (!session_activate(session)) { - fprintf(stderr, "Could not activate session\n"); + if (!session_activate(session)) goto error_bus; - } - if (!take_control(session)) { - fprintf(stderr, "Could not take control of session\n"); + if (!take_control(session)) goto error_bus; - } return true; diff --git a/backend/drm/udev.c b/backend/drm/udev.c index c54403030..ebc68c6bd 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -12,6 +12,7 @@ #include "backend/drm/udev.h" #include "backend/drm/session.h" #include "backend/drm/drm.h" +#include "common/log.h" static bool device_is_kms(struct wlr_udev *udev, struct wlr_session *session, @@ -59,8 +60,10 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) int fd = -1; struct udev_enumerate *en = udev_enumerate_new(udev->udev); - if (!en) + if (!en) { + wlr_log(L_ERROR, "Failed to create udev enumeration"); return -1; + } udev_enumerate_add_match_subsystem(en, "drm"); udev_enumerate_add_match_sysname(en, "card[0-9]*"); @@ -84,8 +87,7 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) } struct udev_device *pci = - udev_device_get_parent_with_subsystem_devtype(dev, - "pci", NULL); + udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL); if (pci) { const char *id = udev_device_get_sysattr_value(pci, "boot_vga"); @@ -117,11 +119,14 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) bool wlr_udev_init(struct wlr_udev *udev) { udev->udev = udev_new(); - if (!udev->udev) + if (!udev->udev) { + wlr_log(L_ERROR, "Failed to create udev context"); return false; + } udev->mon = udev_monitor_new_from_netlink(udev->udev, "udev"); if (!udev->mon) { + wlr_log(L_ERROR, "Failed to create udev monitor"); udev_unref(udev->udev); return false; } diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index bd3d41055..1fe4b7b05 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -59,7 +59,7 @@ struct wlr_drm_display { bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, struct wlr_drm_display *disp, const char *str); -void wlr_drm_display_free(struct wlr_drm_display *disp); +void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore); void wlr_drm_display_begin(struct wlr_drm_display *disp); void wlr_drm_display_end(struct wlr_drm_display *disp); From 115d4ae637673e348d5542740a158e6dcee0cf80 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 2 May 2017 14:08:34 +1200 Subject: [PATCH 06/21] Changed events to use wayland functions. --- backend/CMakeLists.txt | 1 - backend/drm/backend.c | 27 +++++++--- backend/drm/drm.c | 65 ++++++++++++++---------- backend/drm/event.c | 93 ----------------------------------- backend/drm/udev.c | 91 ++++++++++++++++++++-------------- include/backend/drm/backend.h | 17 +++++-- include/backend/drm/event.h | 25 ---------- include/backend/drm/udev.h | 5 +- 8 files changed, 127 insertions(+), 197 deletions(-) delete mode 100644 backend/drm/event.c delete mode 100644 include/backend/drm/event.h diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 2d6e734f9..344dd3cc0 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -11,7 +11,6 @@ add_library(wlr-backend wayland/wl_output.c drm/backend.c drm/drm.c - drm/event.c drm/session.c drm/udev.c ) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index da7ca1e49..769a4a5c5 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -6,7 +6,6 @@ #include "backend/drm/backend.h" #include "backend/drm/drm.h" -#include "backend/drm/event.h" #include "backend/drm/session.h" #include "backend/drm/udev.h" #include "common/log.h" @@ -19,12 +18,18 @@ struct wlr_drm_backend *wlr_drm_backend_init(void) return NULL; } - if (!wlr_session_start(&backend->session)) { - wlr_log(L_ERROR, "Failed to start session"); - goto error; + backend->event_loop = wl_event_loop_create(); + if (!backend->event_loop) { + wlr_log(L_ERROR, "Failed to create event loop"); + goto error_backend; } - if (!wlr_udev_init(&backend->udev)) { + if (!wlr_session_start(&backend->session)) { + wlr_log(L_ERROR, "Failed to start session"); + goto error_loop; + } + + if (!wlr_udev_init(backend)) { wlr_log(L_ERROR, "Failed to start udev"); goto error_session; } @@ -40,6 +45,10 @@ struct wlr_drm_backend *wlr_drm_backend_init(void) goto error_fd; } + wl_signal_init(&backend->signals.display_add); + wl_signal_init(&backend->signals.display_rem); + wl_signal_init(&backend->signals.display_render); + wlr_drm_scan_connectors(backend); return backend; @@ -50,7 +59,9 @@ error_udev: wlr_udev_free(&backend->udev); error_session: wlr_session_end(&backend->session); -error: +error_loop: + wl_event_loop_destroy(backend->event_loop); +error_backend: free(backend); return NULL; } @@ -69,7 +80,9 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) wlr_session_release_device(&backend->session, backend->fd); wlr_session_end(&backend->session); - free(backend->events); + wl_event_source_remove(backend->event_src.drm); + wl_event_loop_destroy(backend->event_loop); + free(backend->displays); free(backend); } diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 94d79e5ce..d1d682248 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -11,10 +11,10 @@ #include #include #include +#include #include "backend/drm/backend.h" #include "backend/drm/drm.h" -#include "backend/drm/event.h" #include "common/log.h" static const char *conn_name[] = { @@ -134,6 +134,33 @@ static bool egl_get_config(EGLDisplay disp, EGLConfig *out) return false; } +static void page_flip_handler(int fd, + unsigned seq, + unsigned tv_sec, + unsigned tv_usec, + void *user) +{ + struct wlr_drm_display *disp = user; + struct wlr_drm_backend *backend = disp->renderer->backend; + + disp->pageflip_pending = true; + if (!disp->cleanup) + wl_signal_emit(&backend->signals.display_render, disp); +} + + +static int drm_event(int fd, uint32_t mask, void *data) +{ + drmEventContext event = { + .version = DRM_EVENT_CONTEXT_VERSION, + .page_flip_handler = page_flip_handler, + }; + + drmHandleEvent(fd, &event); + + return 1; +} + bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, struct wlr_drm_backend *backend, int fd) { @@ -177,6 +204,13 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, goto error_egl; } + backend->event_src.drm = wl_event_loop_add_fd(backend->event_loop, + backend->fd, WL_EVENT_READABLE, drm_event, NULL); + if (!backend->event_src.drm) { + wlr_log(L_ERROR, "Failed to create DRM event source"); + goto error_egl; + } + renderer->fd = fd; renderer->backend = backend; @@ -252,13 +286,13 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) if (disp->state == DRM_DISP_DISCONNECTED && conn->connection == DRM_MODE_CONNECTED) { disp->state = DRM_DISP_NEEDS_MODESET; - wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_ADD); + wl_signal_emit(&backend->signals.display_add, disp); } else if (disp->state == DRM_DISP_CONNECTED && conn->connection != DRM_MODE_CONNECTED) { disp->state = DRM_DISP_DISCONNECTED; wlr_drm_display_free(disp, false); - wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); + wl_signal_emit(&backend->signals.display_rem, disp); } drmModeFreeConnector(conn); @@ -488,24 +522,11 @@ error: drmModeFreeConnector(conn); free(disp->modes); - wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); + wl_signal_emit(&backend->signals.display_rem, disp); return false; } -static void page_flip_handler(int fd, - unsigned seq, - unsigned tv_sec, - unsigned tv_usec, - void *user) -{ - struct wlr_drm_display *disp = user; - - disp->pageflip_pending = true; - if (!disp->cleanup) - wlr_drm_add_event(disp->renderer->backend, disp, DRM_EV_RENDER); -} - void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore) { if (!disp || disp->state != DRM_DISP_CONNECTED) @@ -542,16 +563,6 @@ void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore) } } -void wlr_drm_event(int fd) -{ - drmEventContext event = { - .version = DRM_EVENT_CONTEXT_VERSION, - .page_flip_handler = page_flip_handler, - }; - - drmHandleEvent(fd, &event); -} - void wlr_drm_display_begin(struct wlr_drm_display *disp) { struct wlr_drm_renderer *renderer = disp->renderer; diff --git a/backend/drm/event.c b/backend/drm/event.c deleted file mode 100644 index db17b5b7f..000000000 --- a/backend/drm/event.c +++ /dev/null @@ -1,93 +0,0 @@ -#include -#include -#include - -#include "backend/drm/backend.h" -#include "backend/drm/event.h" -#include "backend/drm/drm.h" -#include "backend/drm/udev.h" - -static inline void event_swap(struct wlr_drm_event *a, struct wlr_drm_event *b) -{ - struct wlr_drm_event tmp = *a; - *a = *b; - *b = tmp; -} - -bool wlr_drm_get_event(struct wlr_drm_backend *backend, - struct wlr_drm_event *restrict ret) -{ - struct pollfd fds[] = { - { .fd = backend->fd, .events = POLLIN }, - { .fd = backend->udev.mon_fd, .events = POLLIN }, - }; - - while (poll(fds, 2, 0) > 0) { - if (fds[0].revents) - wlr_drm_event(backend->fd); - if (fds[1].revents) - wlr_udev_event(backend); - } - - if (backend->event_len == 0) { - ret->type = DRM_EV_NONE; - ret->display = NULL; - return false; - } - - struct wlr_drm_event *ev = backend->events; - - // Downheap - *ret = ev[0]; - ev[0] = ev[--backend->event_len]; - - size_t i = 0; - while (i < backend->event_len / 2) { - size_t left = i * 2 + 1; - size_t right = i * 2 + 2; - size_t max = (ev[left].type > ev[right].type) ? left : right; - - if (ev[i].type <= ev[max].type) { - event_swap(&ev[i], &ev[max]); - i = max; - } else { - break; - } - } - - return true; -} - -bool wlr_drm_add_event(struct wlr_drm_backend *backend, - struct wlr_drm_display *disp, enum wlr_drm_event_type type) -{ - if (type == DRM_EV_NONE) - return true; - - if (backend->event_len == backend->event_cap) { - size_t new_size = (backend->event_cap == 0) ? 8 : backend->event_cap * 2; - - struct wlr_drm_event *new = realloc(backend->events, sizeof *new * new_size); - if (!new) { - return false; - } - - backend->event_cap = new_size; - backend->events = new; - } - - struct wlr_drm_event *ev = backend->events; - - // Upheap - size_t i = backend->event_len++; - ev[i].type = type; - ev[i].display = disp; - - size_t j; - while (i > 0 && ev[i].type > ev[(j = (i - 1) / 2)].type) { - event_swap(&ev[i], &ev[j]); - i = j; - } - - return true; -} diff --git a/backend/drm/udev.c b/backend/drm/udev.c index ebc68c6bd..6c4aa0740 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "backend/drm/backend.h" #include "backend/drm/udev.h" @@ -116,48 +117,14 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) return fd; } -bool wlr_udev_init(struct wlr_udev *udev) -{ - udev->udev = udev_new(); - if (!udev->udev) { - wlr_log(L_ERROR, "Failed to create udev context"); - return false; - } - - udev->mon = udev_monitor_new_from_netlink(udev->udev, "udev"); - if (!udev->mon) { - wlr_log(L_ERROR, "Failed to create udev monitor"); - udev_unref(udev->udev); - return false; - } - - udev_monitor_filter_add_match_subsystem_devtype(udev->mon, "drm", NULL); - udev_monitor_enable_receiving(udev->mon); - - udev->mon_fd = udev_monitor_get_fd(udev->mon); - udev->drm_path = NULL; - - return true; -} - -void wlr_udev_free(struct wlr_udev *udev) - -{ - if (!udev) - return; - - udev_monitor_unref(udev->mon); - udev_unref(udev->udev); - free(udev->drm_path); -} - -void wlr_udev_event(struct wlr_drm_backend *backend) +static int udev_event(int fd, uint32_t mask, void *data) { + struct wlr_drm_backend *backend = data; struct wlr_udev *udev = &backend->udev; struct udev_device *dev = udev_monitor_receive_device(udev->mon); if (!dev) - return; + return 1; const char *path = udev_device_get_devnode(dev); if (!path || strcmp(path, udev->drm_path) != 0) @@ -171,4 +138,54 @@ void wlr_udev_event(struct wlr_drm_backend *backend) out: udev_device_unref(dev); + return 1; +} + +bool wlr_udev_init(struct wlr_drm_backend *backend) +{ + struct wlr_udev *udev = &backend->udev; + + udev->udev = udev_new(); + if (!udev->udev) { + wlr_log(L_ERROR, "Failed to create udev context"); + return false; + } + + udev->mon = udev_monitor_new_from_netlink(udev->udev, "udev"); + if (!udev->mon) { + wlr_log(L_ERROR, "Failed to create udev monitor"); + goto error_udev; + } + + udev_monitor_filter_add_match_subsystem_devtype(udev->mon, "drm", NULL); + udev_monitor_enable_receiving(udev->mon); + + backend->event_src.udev = wl_event_loop_add_fd(backend->event_loop, + udev_monitor_get_fd(udev->mon), WL_EVENT_READABLE, + udev_event, backend); + if (!backend->event_src.udev) { + wlr_log(L_ERROR, "Failed to create udev event source"); + goto error_mon; + } + + udev->drm_path = NULL; + + return true; + +error_mon: + udev_monitor_unref(udev->mon); +error_udev: + udev_unref(udev->udev); + return false; +} + +void wlr_udev_free(struct wlr_udev *udev) + +{ + if (!udev) + return; + + udev_monitor_unref(udev->mon); + udev_unref(udev->udev); + free(udev->drm_path); } diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index caa18bcce..25a42c375 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "session.h" #include "udev.h" @@ -16,10 +17,18 @@ struct wlr_drm_backend { int fd; bool paused; - // Priority Queue (Max-heap) - size_t event_cap; - size_t event_len; - struct wlr_drm_event *events; + struct wl_event_loop *event_loop; + + struct { + struct wl_event_source *drm; + struct wl_event_source *udev; + } event_src; + + struct { + struct wl_signal display_add; + struct wl_signal display_rem; + struct wl_signal display_render; + } signals; size_t display_len; struct wlr_drm_display *displays; diff --git a/include/backend/drm/event.h b/include/backend/drm/event.h deleted file mode 100644 index 2155bd320..000000000 --- a/include/backend/drm/event.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef EVENT_H -#define EVENT_H - -#include -#include "drm.h" - -enum wlr_drm_event_type { - DRM_EV_NONE, - DRM_EV_RENDER, - DRM_EV_DISPLAY_REM, - DRM_EV_DISPLAY_ADD, -}; - -struct wlr_drm_event { - enum wlr_drm_event_type type; - struct wlr_drm_display *display; -}; - -struct wlr_drm_backend; -bool wlr_drm_get_event(struct wlr_drm_backend *backend, - struct wlr_drm_event *restrict ret); -bool wlr_drm_add_event(struct wlr_drm_backend *backend, - struct wlr_drm_display *disp, enum wlr_drm_event_type type); - -#endif diff --git a/include/backend/drm/udev.h b/include/backend/drm/udev.h index 6b10c9ec1..576b5d6e5 100644 --- a/include/backend/drm/udev.h +++ b/include/backend/drm/udev.h @@ -8,15 +8,14 @@ struct wlr_udev { struct udev *udev; struct udev_monitor *mon; - int mon_fd; char *drm_path; }; -bool wlr_udev_init(struct wlr_udev *udev); +struct wlr_drm_backend; +bool wlr_udev_init(struct wlr_drm_backend *backend); void wlr_udev_free(struct wlr_udev *udev); int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session); -struct wlr_drm_backend; void wlr_udev_event(struct wlr_drm_backend *backend); #endif From e9d716fc0c294849b627b35f6ea15f60fbdeb522 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 2 May 2017 14:34:33 +1200 Subject: [PATCH 07/21] Changed display to use list_t. --- backend/drm/backend.c | 24 +++++++++++--- backend/drm/drm.c | 62 ++++++++++++++++++++--------------- include/backend/drm/backend.h | 5 +-- 3 files changed, 57 insertions(+), 34 deletions(-) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 769a4a5c5..73e57bfa0 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -4,6 +4,8 @@ #include #include +#include + #include "backend/drm/backend.h" #include "backend/drm/drm.h" #include "backend/drm/session.h" @@ -18,10 +20,16 @@ struct wlr_drm_backend *wlr_drm_backend_init(void) return NULL; } + backend->displays = list_create(); + if (!backend->displays) { + wlr_log(L_ERROR, "Failed to allocate list"); + goto error_backend; + } + backend->event_loop = wl_event_loop_create(); if (!backend->event_loop) { wlr_log(L_ERROR, "Failed to create event loop"); - goto error_backend; + goto error_list; } if (!wlr_session_start(&backend->session)) { @@ -61,19 +69,25 @@ error_session: wlr_session_end(&backend->session); error_loop: wl_event_loop_destroy(backend->event_loop); +error_list: + list_free(backend->displays); error_backend: free(backend); return NULL; } +static void free_display(void *item) +{ + struct wlr_drm_display *disp = item; + wlr_drm_display_free(disp, true); +} + void wlr_drm_backend_free(struct wlr_drm_backend *backend) { if (!backend) return; - for (size_t i = 0; i < backend->display_len; ++i) { - wlr_drm_display_free(&backend->displays[i], true); - } + list_foreach(backend->displays, free_display); wlr_drm_renderer_free(&backend->renderer); wlr_udev_free(&backend->udev); @@ -83,7 +97,7 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) wl_event_source_remove(backend->event_src.drm); wl_event_loop_destroy(backend->event_loop); - free(backend->displays); + list_free(backend->displays); free(backend); } diff --git a/backend/drm/drm.c b/backend/drm/drm.c index d1d682248..226c79fbf 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -240,6 +240,19 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) gbm_device_destroy(renderer->gbm); } +static int find_id(const void *item, const void *cmp_to) +{ + const struct wlr_drm_display *disp = item; + const uint32_t *id = cmp_to; + + if (disp->connector < *id) + return -1; + else if (disp->connector > *id) + return 1; + else + return 0; +} + void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { drmModeRes *res = drmModeGetResources(backend->fd); @@ -248,39 +261,35 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) return; } - // I don't know if this needs to be allocated with realloc like this, - // as it may not even be possible for the number of connectors to change. - // I'll just have to see how DisplayPort MST works with DRM. - if ((size_t)res->count_connectors > backend->display_len) { - struct wlr_drm_display *new = realloc(backend->displays, sizeof *new * res->count_connectors); - if (!new) { - wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); - goto error; - } - - for (int i = backend->display_len; i < res->count_connectors; ++i) { - new[i] = (struct wlr_drm_display) { - .state = DRM_DISP_INVALID, - .renderer = &backend->renderer, - }; - } - - backend->display_len = res->count_connectors; - backend->displays = new; - } - for (int i = 0; i < res->count_connectors; ++i) { - struct wlr_drm_display *disp = &backend->displays[i]; - drmModeConnector *conn = drmModeGetConnector(backend->fd, res->connectors[i]); - if (!conn) - continue; + uint32_t id = res->connectors[i]; + + drmModeConnector *conn = drmModeGetConnector(backend->fd, id); + if (!conn) { + wlr_log(L_ERROR, "Failed to get DRM connector"); + continue; + } + + struct wlr_drm_display *disp; + int index = list_seq_find(backend->displays, find_id, &id); + + if (index == -1) { + disp = calloc(1, sizeof *disp); + if (!disp) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + drmModeFreeConnector(conn); + continue; + } - if (backend->displays[i].state == DRM_DISP_INVALID) { disp->state = DRM_DISP_DISCONNECTED; disp->connector = res->connectors[i]; snprintf(disp->name, sizeof disp->name, "%s-%"PRIu32, conn_name[conn->connector_type], conn->connector_type_id); + + list_add(backend->displays, disp); + } else { + disp = backend->displays->items[index]; } if (disp->state == DRM_DISP_DISCONNECTED && @@ -298,7 +307,6 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) drmModeFreeConnector(conn); } -error: drmModeFreeResources(res); } diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index 25a42c375..87471fbbc 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -8,6 +8,8 @@ #include #include +#include + #include "session.h" #include "udev.h" #include "event.h" @@ -30,8 +32,7 @@ struct wlr_drm_backend { struct wl_signal display_render; } signals; - size_t display_len; - struct wlr_drm_display *displays; + list_t *displays; uint32_t taken_crtcs; From e446a5300b742dd8a7f403bf96d1137e91ba1b11 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 2 May 2017 18:13:17 +1200 Subject: [PATCH 08/21] Added example. --- CMake/FindGBM.cmake | 39 ++++++++++++ CMakeLists.txt | 5 +- backend/CMakeLists.txt | 7 +++ backend/drm/backend.c | 17 +++++- backend/drm/drm.c | 10 +++- backend/drm/session.c | 2 +- backend/drm/udev.c | 8 ++- example/CMakeLists.txt | 8 +++ example/example-drm.c | 109 ++++++++++++++++++++++++++++++++++ include/backend/drm/backend.h | 5 +- include/backend/drm/drm.h | 3 +- include/wlr/backend/drm.h | 20 +++++++ 12 files changed, 220 insertions(+), 13 deletions(-) create mode 100644 CMake/FindGBM.cmake create mode 100644 example/example-drm.c create mode 100644 include/wlr/backend/drm.h diff --git a/CMake/FindGBM.cmake b/CMake/FindGBM.cmake new file mode 100644 index 000000000..85df1f7c3 --- /dev/null +++ b/CMake/FindGBM.cmake @@ -0,0 +1,39 @@ +#.rst: +# FindGBM +# ------- +# +# Find GBM library +# +# Try to find GBM library on UNIX systems. The following values are defined +# +# :: +# +# GBM_FOUND - True if gbm is available +# GBM_INCLUDE_DIRS - Include directories for gbm +# GBM_LIBRARIES - List of libraries for gbm +# GBM_DEFINITIONS - List of definitions for gbm +# +#============================================================================= +# Copyright (c) 2015 Jari Vetoniemi +# +# Distributed under the OSI-approved BSD License (the "License"); +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= + +set_package_properties(GBM PROPERTIES + URL "http://www.mesa3d.org/" + DESCRIPTION "Generic buffer manager") + +find_package(PkgConfig) +pkg_check_modules(PC_GBM QUIET gbm) +find_library(GBM_LIBRARIES NAMES gbm HINTS ${PC_GBM_LIBRARY_DIRS}) +find_path(GBM_INCLUDE_DIRS gbm.h HINTS ${PC_GBM_INCLUDE_DIRS}) + +set(GBM_DEFINITIONS ${PC_GBM_CFLAGS_OTHER}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(GBM DEFAULT_MSG GBM_INCLUDE_DIRS GBM_LIBRARIES) +mark_as_advanced(GBM_INCLUDE_DIRS GBM_LIBRARIES GBM_DEFINITIONS) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30a2c37d5..192eb4448 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,10 +48,11 @@ find_package(WaylandProtocols REQUIRED) find_package(EGL REQUIRED) find_package(GLESv2 REQUIRED) find_package(DRM REQUIRED) +find_package(GBM REQUIRED) find_package(LibInput REQUIRED) -find_package(Udev) +find_package(Udev REQUIRED) find_package(Dbus) -find_package(Systemd) +find_package(Systemd REQUIRED) include(Wayland) include(Manpage) diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 344dd3cc0..184854fe1 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -19,4 +19,11 @@ target_link_libraries(wlr-backend wlr-common wlr-wayland ${WAYLAND_LIBRARIES} + ${DRM_LIBRARIES} + ${GBM_LIBRARIES} + ${GLESv2_LIBRARIES} + ${EGL_LIBRARIES} + ${SYSTEMD_LIBRARIES} + ${UDEV_LIBRARIES} + ${GBM_LIBRARIES} ) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 73e57bfa0..7db6e9a10 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -12,7 +12,9 @@ #include "backend/drm/udev.h" #include "common/log.h" -struct wlr_drm_backend *wlr_drm_backend_init(void) +struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, + struct wl_listener *rem, + struct wl_listener *render) { struct wlr_drm_backend *backend = calloc(1, sizeof *backend); if (!backend) { @@ -57,6 +59,13 @@ struct wlr_drm_backend *wlr_drm_backend_init(void) wl_signal_init(&backend->signals.display_rem); wl_signal_init(&backend->signals.display_render); + if (add) + wl_signal_add(&backend->signals.display_add, add); + if (rem) + wl_signal_add(&backend->signals.display_rem, rem); + if (render) + wl_signal_add(&backend->signals.display_render, render); + wlr_drm_scan_connectors(backend); return backend; @@ -80,6 +89,7 @@ static void free_display(void *item) { struct wlr_drm_display *disp = item; wlr_drm_display_free(disp, true); + free(disp); } void wlr_drm_backend_free(struct wlr_drm_backend *backend) @@ -95,9 +105,14 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) wlr_session_end(&backend->session); wl_event_source_remove(backend->event_src.drm); + wl_event_source_remove(backend->event_src.udev); wl_event_loop_destroy(backend->event_loop); list_free(backend->displays); free(backend); } +struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend) +{ + return backend->event_loop; +} diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 226c79fbf..470a76bbe 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -281,6 +281,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) continue; } + disp->renderer = &backend->renderer; disp->state = DRM_DISP_DISCONNECTED; disp->connector = res->connectors[i]; snprintf(disp->name, sizeof disp->name, "%s-%"PRIu32, @@ -288,6 +289,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) conn->connector_type_id); list_add(backend->displays, disp); + wlr_log(L_INFO, "Found display '%s'", disp->name); } else { disp = backend->displays->items[index]; } @@ -295,12 +297,14 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) if (disp->state == DRM_DISP_DISCONNECTED && conn->connection == DRM_MODE_CONNECTED) { disp->state = DRM_DISP_NEEDS_MODESET; + wlr_log(L_INFO, "Sending modesetting signal for '%s'", disp->name); wl_signal_emit(&backend->signals.display_add, disp); } else if (disp->state == DRM_DISP_CONNECTED && conn->connection != DRM_MODE_CONNECTED) { disp->state = DRM_DISP_DISCONNECTED; wlr_drm_display_free(disp, false); + wlr_log(L_INFO, "Sending destruction signal for '%s'", disp->name); wl_signal_emit(&backend->signals.display_rem, disp); } @@ -430,9 +434,9 @@ static drmModeModeInfo *select_mode(size_t num_modes, return NULL; } -bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, - struct wlr_drm_display *disp, const char *str) +bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str) { + struct wlr_drm_backend *backend = disp->renderer->backend; wlr_log(L_INFO, "Modesetting %s with '%s'", disp->name, str); drmModeConnector *conn = drmModeGetConnector(backend->fd, disp->connector); @@ -519,7 +523,7 @@ bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, drmModeFreeConnector(conn); - wlr_log(L_INFO, "Configuring %s with mode %"PRIu16"x%"PRIu16"@%"PRIu32"\n", + wlr_log(L_INFO, "Configuring %s with mode %"PRIu16"x%"PRIu16"@%"PRIu32"", disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay, disp->active_mode->vrefresh); diff --git a/backend/drm/session.c b/backend/drm/session.c index 49223334c..073f822b7 100644 --- a/backend/drm/session.c +++ b/backend/drm/session.c @@ -194,7 +194,7 @@ bool wlr_session_start(struct wlr_session *session) sprintf(session->path, fmt, session->id); - ret = sd_bus_open_system(&session->bus); + ret = sd_bus_default_system(&session->bus); if (ret < 0) { wlr_log(L_ERROR, "Failed to open DBus connection: %s", strerror(-ret)); goto error; diff --git a/backend/drm/udev.c b/backend/drm/udev.c index 6c4aa0740..ae99bcfc1 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -94,9 +94,10 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) const char *id = udev_device_get_sysattr_value(pci, "boot_vga"); if (id && strcmp(id, "1") == 0) is_boot_vga = true; - udev_device_unref(pci); + //udev_device_unref(pci); } + // We already have a valid GPU if (!is_boot_vga && fd >= 0) { udev_device_unref(dev); continue; @@ -107,9 +108,10 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) continue; } - if (is_boot_vga) { + udev_device_unref(dev); + + if (is_boot_vga) break; - } } udev_enumerate_unref(en); diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 737683936..dfb069b4b 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -5,3 +5,11 @@ add_executable(example target_link_libraries(example wlr-backend ) + +add_executable(example-drm + example-drm.c +) + +target_link_libraries(example-drm + wlr-backend +) diff --git a/example/example-drm.c b/example/example-drm.c new file mode 100644 index 000000000..4c9442266 --- /dev/null +++ b/example/example-drm.c @@ -0,0 +1,109 @@ +#define _POSIX_C_SOURCE 199309L +#include +#include +#include +#include +#include + +#include + +struct state { + float color[3]; + int dec; + + struct timespec last_frame; + + struct wl_listener add; + struct wl_listener rem; + struct wl_listener render; +}; + +void display_add(struct wl_listener *listener, void *data) +{ + struct wlr_drm_display *disp = data; + + fprintf(stderr, "Display added\n"); + wlr_drm_display_modeset(disp, "preferred"); +} + +void display_rem(struct wl_listener *listener, void *data) +{ + fprintf(stderr, "Display removed\n"); +} + +void display_render(struct wl_listener *listener, void *data) +{ + struct wlr_drm_display *disp = data; + struct state *s = wl_container_of(listener, s, render); + + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + + long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 + + (now.tv_nsec - s->last_frame.tv_nsec) / 1000000; + int inc = (s->dec + 1) % 3; + + s->color[inc] += ms / 2000.0f; + s->color[s->dec] -= ms / 2000.0f; + + if (s->color[s->dec] < 0.0f) { + s->color[inc] = 1.0f; + s->color[s->dec] = 0.0f; + + s->dec = inc; + } + + s->last_frame = now; + + wlr_drm_display_begin(disp); + + glClearColor(s->color[0], s->color[1], s->color[2], 1.0); + glClear(GL_COLOR_BUFFER_BIT); + + wlr_drm_display_end(disp); +} + +int timer_done(void *data) +{ + *(bool *)data = true; + return 1; +} + +int main() +{ + if (getenv("DISPLAY")) { + fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); + return 1; + } else if (getenv("WAYLAND_DISPLAY")) { + fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n"); + return 1; + } + + struct state state = { + .color = { 1.0, 0.0, 0.0 }, + .dec = 0, + .add = { .notify = display_add }, + .rem = { .notify = display_rem }, + .render = { .notify = display_render }, + }; + + wl_list_init(&state.add.link); + wl_list_init(&state.rem.link); + wl_list_init(&state.render.link); + clock_gettime(CLOCK_MONOTONIC, &state.last_frame); + + struct wlr_drm_backend *wlr = wlr_drm_backend_init(&state.add, &state.rem, &state.render); + + bool done = false; + struct wl_event_loop *event_loop = wlr_drm_backend_get_event_loop(wlr); + struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, + timer_done, &done); + + wl_event_source_timer_update(timer, 10000); + + while (!done) + wl_event_loop_dispatch(event_loop, 0); + + wl_event_source_remove(timer); + wlr_drm_backend_free(wlr); +} diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index 87471fbbc..1ad8e479b 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -9,6 +9,7 @@ #include #include +#include #include "session.h" #include "udev.h" @@ -41,7 +42,9 @@ struct wlr_drm_backend { struct wlr_udev udev; }; -struct wlr_drm_backend *wlr_drm_backend_init(void); +struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, + struct wl_listener *rem, + struct wl_listener *render); void wlr_drm_backend_free(struct wlr_drm_backend *backend); #endif diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 1fe4b7b05..17d4aa908 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -57,8 +57,7 @@ struct wlr_drm_display { bool cleanup; }; -bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, - struct wlr_drm_display *disp, const char *str); +bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str); void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore); void wlr_drm_display_begin(struct wlr_drm_display *disp); diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h new file mode 100644 index 000000000..5179db4bf --- /dev/null +++ b/include/wlr/backend/drm.h @@ -0,0 +1,20 @@ +#ifndef WLR_BACKEND_DRM_H +#define WLR_BACKEND_DRM_H + +#include + +struct wlr_drm_backend; +struct wlr_drm_display; + +struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, + struct wl_listener *rem, + struct wl_listener *render); +void wlr_drm_backend_free(struct wlr_drm_backend *backend); + +struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend); + +bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str); +void wlr_drm_display_begin(struct wlr_drm_display *disp); +void wlr_drm_display_end(struct wlr_drm_display *disp); + +#endif From 762ac7f4c0168bf2ce536d94b3b44cb95939d769 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 14:11:22 +1200 Subject: [PATCH 09/21] New session interface. --- CMakeLists.txt | 4 +- include/session/interface.h | 20 ++++ include/wlr/session.h | 12 ++ session/CMakeLists.txt | 24 ++++ session/logind.c | 220 ++++++++++++++++++++++++++++++++++++ session/session.c | 38 +++++++ 6 files changed, 316 insertions(+), 2 deletions(-) create mode 100644 include/session/interface.h create mode 100644 include/wlr/session.h create mode 100644 session/CMakeLists.txt create mode 100644 session/logind.c create mode 100644 session/session.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 192eb4448..616a89115 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,8 +51,7 @@ find_package(DRM REQUIRED) find_package(GBM REQUIRED) find_package(LibInput REQUIRED) find_package(Udev REQUIRED) -find_package(Dbus) -find_package(Systemd REQUIRED) +find_package(Systemd) include(Wayland) include(Manpage) @@ -62,5 +61,6 @@ include_directories(include) add_subdirectory(backend) add_subdirectory(common) add_subdirectory(wayland) +add_subdirectory(session) add_subdirectory(example) diff --git a/include/session/interface.h b/include/session/interface.h new file mode 100644 index 000000000..5dde89f00 --- /dev/null +++ b/include/session/interface.h @@ -0,0 +1,20 @@ +#ifndef WLR_SESSION_INTERFACE_H +#define WLR_SESSION_INTERFACE_H + +struct wlr_session; + +struct session_interface { + struct wlr_session *(*start)(void); + void (*finish)(struct wlr_session *session); + int (*open)(struct wlr_session *restrict session, + const char *restrict path); + void (*close)(struct wlr_session *session, int fd); +}; + +struct wlr_session { + struct session_interface iface; +}; + +extern const struct session_interface session_logind_iface; + +#endif diff --git a/include/wlr/session.h b/include/wlr/session.h new file mode 100644 index 000000000..cf04f1dab --- /dev/null +++ b/include/wlr/session.h @@ -0,0 +1,12 @@ +#ifndef WLR_SESSION_H +#define WLR_SESSION_H + +struct wlr_session; + +struct wlr_session *wlr_session_start(void); +void wlr_session_finish(struct wlr_session *session); +int wlr_session_open_file(struct wlr_session *restrict session, + const char *restrict path); +void wlr_session_close_file(struct wlr_session *session, int fd); + +#endif diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt new file mode 100644 index 000000000..304f3220b --- /dev/null +++ b/session/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories( + ${WAYLAND_INCLUDE_DIR} +) + +set(sources + session.c +) + +set(libs + wlr-common + ${WAYLAND_LIBRARIES} +) + +if (SYSTEMD_FOUND) + add_definitions(${SYSTEMD_DEFINITIONS}) + include_directories(${SYSTEMD_INCLUDE_DIRS}) + + add_definitions(-DHAS_SYSTEMD) + list(APPEND sources logind.c) + list(APPEND libs ${SYSTEMD_LIBRARIES}) +endif () + +add_library(wlr-session ${sources}) +target_link_libraries(wlr-session ${libs}) diff --git a/session/logind.c b/session/logind.c new file mode 100644 index 000000000..c81a20206 --- /dev/null +++ b/session/logind.c @@ -0,0 +1,220 @@ +#define _POSIX_C_SOURCE 200809L + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "session/interface.h" +#include "common/log.h" + +struct logind_session { + struct wlr_session base; + + sd_bus *bus; + + char *id; + char *path; + char *seat; +}; + +static int logind_take_device(struct wlr_session *restrict base, + const char *restrict path) { + + struct logind_session *session = wl_container_of(base, session, base); + + int ret; + int fd = -1; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + + struct stat st; + if (stat(path, &st) < 0) { + wlr_log(L_ERROR, "Failed to stat '%s'", path); + return -1; + } + + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", + session->path, "org.freedesktop.login1.Session", "TakeDevice", + &error, &msg, "uu", major(st.st_rdev), minor(st.st_rdev)); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to take device '%s': %s", path, error.message); + goto error; + } + + int paused = 0; + ret = sd_bus_message_read(msg, "hb", &fd, &paused); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to parse DBus response for '%s': %s", + path, strerror(-ret)); + goto error; + } + + // The original fd seem to be closed when the message is freed + // so we just clone it. + fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); + if (fd == -1) { + wlr_log(L_ERROR, "Failed to clone file descriptor for '%s': %s", + path, strerror(errno)); + goto error; + } + +error: + sd_bus_error_free(&error); + sd_bus_message_unref(msg); + return fd; +} + +static void logind_release_device(struct wlr_session *base, int fd) { + struct logind_session *session = wl_container_of(base, session, base); + + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + + struct stat st; + if (fstat(fd, &st) < 0) { + wlr_log(L_ERROR, "Failed to stat device '%d'", fd); + return; + } + + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", + session->path, "org.freedesktop.login1.Session", "ReleaseDevice", + &error, &msg, "uu", major(st.st_rdev), minor(st.st_rdev)); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to release device '%d'", fd); + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); +} + +static bool session_activate(struct logind_session *session) { + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", + session->path, "org.freedesktop.login1.Session", "Activate", + &error, &msg, ""); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to activate session"); + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); + return ret >= 0; +} + +static bool take_control(struct logind_session *session) { + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", + session->path, "org.freedesktop.login1.Session", "TakeControl", + &error, &msg, "b", false); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to take control of session"); + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); + return ret >= 0; +} + +static void release_control(struct logind_session *session) { + int ret; + sd_bus_message *msg = NULL; + sd_bus_error error = SD_BUS_ERROR_NULL; + + ret = sd_bus_call_method(session->bus, "org.freedesktop.login1", + session->path, "org.freedesktop.login1.Session", "ReleaseControl", + &error, &msg, ""); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to release control of session"); + } + + sd_bus_error_free(&error); + sd_bus_message_unref(msg); +} + +static void logind_session_finish(struct wlr_session *base) { + struct logind_session *session = wl_container_of(base, session, base); + + release_control(session); + + sd_bus_unref(session->bus); + free(session->id); + free(session->path); + free(session->seat); + free(session); +} + +static struct wlr_session *logind_session_start(void) { + int ret; + struct logind_session *session = calloc(1, sizeof(*session)); + if (!session) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return NULL; + } + + ret = sd_pid_get_session(getpid(), &session->id); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to get session id: %s", strerror(-ret)); + goto error; + } + + ret = sd_session_get_seat(session->id, &session->seat); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to get seat id: %s", strerror(-ret)); + goto error; + } + + const char *fmt = "/org/freedesktop/login1/session/%s"; + int len = snprintf(NULL, 0, fmt, session->id); + + session->path = malloc(len + 1); + if (!session->path) + goto error; + + sprintf(session->path, fmt, session->id); + + ret = sd_bus_default_system(&session->bus); + if (ret < 0) { + wlr_log(L_ERROR, "Failed to open DBus connection: %s", strerror(-ret)); + goto error; + } + + if (!session_activate(session)) + goto error_bus; + + if (!take_control(session)) + goto error_bus; + + return &session->base; + +error_bus: + sd_bus_unref(session->bus); + +error: + free(session->path); + free(session->id); + free(session->seat); + return NULL; +} + +const struct session_interface session_logind_iface = { + .start = logind_session_start, + .finish = logind_session_finish, + .open = logind_take_device, + .close = logind_release_device, +}; diff --git a/session/session.c b/session/session.c new file mode 100644 index 000000000..88391e6eb --- /dev/null +++ b/session/session.c @@ -0,0 +1,38 @@ +#include + +#include +#include "session/interface.h" + +static const struct session_interface *ifaces[] = { +#ifdef HAS_SYSTEMD + &session_logind_iface, +#endif + NULL, +}; + +struct wlr_session *wlr_session_start(void) { + const struct session_interface **iter; + + for (iter = ifaces; *iter; ++iter) { + struct wlr_session *session = (*iter)->start(); + if (session) { + return session; + } + } + + return NULL; +} + +void wlr_session_finish(struct wlr_session *session) { + session->iface.finish(session); +}; + +int wlr_session_open_file(struct wlr_session *restrict session, + const char *restrict path) { + + return session->iface.open(session, path); +} + +void wlr_session_close_file(struct wlr_session *session, int fd) { + session->iface.close(session, fd); +} From 81998fdc98231cb1b2e050da2fcec7c75d46320c Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 16:23:07 +1200 Subject: [PATCH 10/21] Removed old session code from DRM backend. --- backend/CMakeLists.txt | 1 - backend/drm/backend.c | 28 ++--- backend/drm/session.c | 219 ---------------------------------- backend/drm/udev.c | 11 +- example/CMakeLists.txt | 1 + example/example-drm.c | 9 +- include/backend/drm/backend.h | 9 +- include/backend/drm/session.h | 24 ---- include/backend/drm/udev.h | 2 +- include/wlr/backend/drm.h | 6 +- session/logind.c | 3 + session/session.c | 3 + 12 files changed, 41 insertions(+), 275 deletions(-) delete mode 100644 backend/drm/session.c delete mode 100644 include/backend/drm/session.h diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 184854fe1..ee8b04d66 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -11,7 +11,6 @@ add_library(wlr-backend wayland/wl_output.c drm/backend.c drm/drm.c - drm/session.c drm/udev.c ) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 7db6e9a10..9f9a02c72 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -4,17 +4,16 @@ #include #include +#include #include #include "backend/drm/backend.h" #include "backend/drm/drm.h" -#include "backend/drm/session.h" #include "backend/drm/udev.h" #include "common/log.h" -struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, - struct wl_listener *rem, - struct wl_listener *render) +struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, + struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render) { struct wlr_drm_backend *backend = calloc(1, sizeof *backend); if (!backend) { @@ -22,6 +21,8 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, return NULL; } + backend->session = session; + backend->displays = list_create(); if (!backend->displays) { wlr_log(L_ERROR, "Failed to allocate list"); @@ -34,17 +35,12 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, goto error_list; } - if (!wlr_session_start(&backend->session)) { - wlr_log(L_ERROR, "Failed to start session"); + if (!wlr_udev_init(backend)) { + wlr_log(L_ERROR, "Failed to start udev"); goto error_loop; } - if (!wlr_udev_init(backend)) { - wlr_log(L_ERROR, "Failed to start udev"); - goto error_session; - } - - backend->fd = wlr_udev_find_gpu(&backend->udev, &backend->session); + backend->fd = wlr_udev_find_gpu(&backend->udev, backend->session); if (backend->fd == -1) { wlr_log(L_ERROR, "Failed to open DRM device"); goto error_udev; @@ -71,11 +67,9 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, return backend; error_fd: - wlr_session_release_device(&backend->session, backend->fd); + wlr_session_close_file(backend->session, backend->fd); error_udev: wlr_udev_free(&backend->udev); -error_session: - wlr_session_end(&backend->session); error_loop: wl_event_loop_destroy(backend->event_loop); error_list: @@ -101,8 +95,8 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) wlr_drm_renderer_free(&backend->renderer); wlr_udev_free(&backend->udev); - wlr_session_release_device(&backend->session, backend->fd); - wlr_session_end(&backend->session); + wlr_session_close_file(backend->session, backend->fd); + wlr_session_finish(backend->session); wl_event_source_remove(backend->event_src.drm); wl_event_source_remove(backend->event_src.udev); diff --git a/backend/drm/session.c b/backend/drm/session.c deleted file mode 100644 index 073f822b7..000000000 --- a/backend/drm/session.c +++ /dev/null @@ -1,219 +0,0 @@ -#define _POSIX_C_SOURCE 200809L - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "backend/drm/backend.h" -#include "backend/drm/session.h" -#include "common/log.h" - -int wlr_session_take_device(struct wlr_session *restrict session, - const char *restrict path, - bool *restrict paused_out) -{ - int ret; - int fd = -1; - sd_bus_message *msg = NULL; - sd_bus_error error = SD_BUS_ERROR_NULL; - - struct stat st; - if (stat(path, &st) < 0) { - wlr_log(L_ERROR, "Failed to stat '%s'", path); - return -1; - } - - ret = sd_bus_call_method(session->bus, - "org.freedesktop.login1", - session->path, - "org.freedesktop.login1.Session", - "TakeDevice", - &error, &msg, - "uu", major(st.st_rdev), minor(st.st_rdev)); - if (ret < 0) { - wlr_log(L_ERROR, "Failed to take device '%s': %s", path, error.message); - goto error; - } - - int paused = 0; - ret = sd_bus_message_read(msg, "hb", &fd, &paused); - if (ret < 0) { - wlr_log(L_ERROR, "Failed to parse DBus response for '%s': %s", - path, strerror(-ret)); - goto error; - } - - // The original fd seem to be closed when the message is freed - // so we just clone it. - fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); - if (fd == -1) { - wlr_log(L_ERROR, "Failed to clone file descriptor for '%s': %s", - path, strerror(errno)); - goto error; - } - - if (paused_out) - *paused_out = paused; - -error: - sd_bus_error_free(&error); - sd_bus_message_unref(msg); - return fd; -} - -void wlr_session_release_device(struct wlr_session *session, int fd) -{ - int ret; - sd_bus_message *msg = NULL; - sd_bus_error error = SD_BUS_ERROR_NULL; - - struct stat st; - if (fstat(fd, &st) < 0) { - wlr_log(L_ERROR, "Failed to stat device '%d'", fd); - return; - } - - ret = sd_bus_call_method(session->bus, - "org.freedesktop.login1", - session->path, - "org.freedesktop.login1.Session", - "ReleaseDevice", - &error, &msg, - "uu", major(st.st_rdev), minor(st.st_rdev)); - if (ret < 0) - wlr_log(L_ERROR, "Failed to release device '%d'", fd); - - sd_bus_error_free(&error); - sd_bus_message_unref(msg); -} - -static bool session_activate(struct wlr_session *session) -{ - int ret; - sd_bus_message *msg = NULL; - sd_bus_error error = SD_BUS_ERROR_NULL; - - ret = sd_bus_call_method(session->bus, - "org.freedesktop.login1", - session->path, - "org.freedesktop.login1.Session", - "Activate", - &error, &msg, - ""); - if (ret < 0) - wlr_log(L_ERROR, "Failed to activate session"); - - sd_bus_error_free(&error); - sd_bus_message_unref(msg); - return ret >= 0; -} - -static bool take_control(struct wlr_session *session) -{ - int ret; - sd_bus_message *msg = NULL; - sd_bus_error error = SD_BUS_ERROR_NULL; - - ret = sd_bus_call_method(session->bus, - "org.freedesktop.login1", - session->path, - "org.freedesktop.login1.Session", - "TakeControl", - &error, &msg, - "b", false); - if (ret < 0) - wlr_log(L_ERROR, "Failed to take control of session"); - - sd_bus_error_free(&error); - sd_bus_message_unref(msg); - return ret >= 0; -} - -static void release_control(struct wlr_session *session) -{ - int ret; - sd_bus_message *msg = NULL; - sd_bus_error error = SD_BUS_ERROR_NULL; - - ret = sd_bus_call_method(session->bus, - "org.freedesktop.login1", - session->path, - "org.freedesktop.login1.Session", - "ReleaseControl", - &error, &msg, - ""); - if (ret < 0) - wlr_log(L_ERROR, "Failed to release control of session"); - - sd_bus_error_free(&error); - sd_bus_message_unref(msg); -} - -void wlr_session_end(struct wlr_session *session) -{ - release_control(session); - - sd_bus_unref(session->bus); - free(session->id); - free(session->path); - free(session->seat); -} - -bool wlr_session_start(struct wlr_session *session) -{ - int ret; - - ret = sd_pid_get_session(getpid(), &session->id); - if (ret < 0) { - wlr_log(L_ERROR, "Failed to get session id: %s", strerror(-ret)); - goto error; - } - - ret = sd_session_get_seat(session->id, &session->seat); - if (ret < 0) { - wlr_log(L_ERROR, "Failed to get seat id: %s", strerror(-ret)); - goto error; - } - - // This could be done using asprintf, but I don't want to define _GNU_SOURCE - - const char *fmt = "/org/freedesktop/login1/session/%s"; - int len = snprintf(NULL, 0, fmt, session->id); - - session->path = malloc(len + 1); - if (!session->path) - goto error; - - sprintf(session->path, fmt, session->id); - - ret = sd_bus_default_system(&session->bus); - if (ret < 0) { - wlr_log(L_ERROR, "Failed to open DBus connection: %s", strerror(-ret)); - goto error; - } - - if (!session_activate(session)) - goto error_bus; - - if (!take_control(session)) - goto error_bus; - - return true; - -error_bus: - sd_bus_unref(session->bus); - -error: - free(session->path); - free(session->id); - free(session->seat); - return false; -} diff --git a/backend/drm/udev.c b/backend/drm/udev.c index ae99bcfc1..6921a9982 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -9,9 +9,10 @@ #include #include +#include + #include "backend/drm/backend.h" #include "backend/drm/udev.h" -#include "backend/drm/session.h" #include "backend/drm/drm.h" #include "common/log.h" @@ -26,7 +27,7 @@ static bool device_is_kms(struct wlr_udev *udev, if (!path) return false; - fd = wlr_session_take_device(session, path, NULL); + fd = wlr_session_open_file(session, path); if (fd < 0) return false; @@ -39,7 +40,7 @@ static bool device_is_kms(struct wlr_udev *udev, goto out_res; if (*fd_out >= 0) { - wlr_session_release_device(session, *fd_out); + wlr_session_close_file(session, *fd_out); free(udev->drm_path); } @@ -52,7 +53,7 @@ static bool device_is_kms(struct wlr_udev *udev, out_res: drmModeFreeResources(res); out_fd: - wlr_session_release_device(session, fd); + wlr_session_close_file(session, fd); return false; } @@ -79,6 +80,7 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) if (!dev) continue; + /* const char *seat = udev_device_get_property_value(dev, "ID_SEAT"); if (!seat) seat = "seat0"; @@ -86,6 +88,7 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) udev_device_unref(dev); continue; } + */ struct udev_device *pci = udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL); diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index dfb069b4b..fb2f3823d 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -12,4 +12,5 @@ add_executable(example-drm target_link_libraries(example-drm wlr-backend + wlr-session ) diff --git a/example/example-drm.c b/example/example-drm.c index 4c9442266..a3a2a8fda 100644 --- a/example/example-drm.c +++ b/example/example-drm.c @@ -6,6 +6,7 @@ #include #include +#include struct state { float color[3]; @@ -92,7 +93,13 @@ int main() wl_list_init(&state.render.link); clock_gettime(CLOCK_MONOTONIC, &state.last_frame); - struct wlr_drm_backend *wlr = wlr_drm_backend_init(&state.add, &state.rem, &state.render); + struct wlr_session *session = wlr_session_start(); + if (!session) { + return 1; + } + + struct wlr_drm_backend *wlr = wlr_drm_backend_init(session, + &state.add, &state.rem, &state.render); bool done = false; struct wl_event_loop *event_loop = wlr_drm_backend_get_event_loop(wlr); diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index 1ad8e479b..32182d0c7 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -8,10 +8,10 @@ #include #include +#include #include #include -#include "session.h" #include "udev.h" #include "event.h" #include "drm.h" @@ -38,13 +38,12 @@ struct wlr_drm_backend { uint32_t taken_crtcs; struct wlr_drm_renderer renderer; - struct wlr_session session; + struct wlr_session *session; struct wlr_udev udev; }; -struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, - struct wl_listener *rem, - struct wl_listener *render); +struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, + struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render); void wlr_drm_backend_free(struct wlr_drm_backend *backend); #endif diff --git a/include/backend/drm/session.h b/include/backend/drm/session.h deleted file mode 100644 index 6936b19ad..000000000 --- a/include/backend/drm/session.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef SESSION_H -#define SESSION_H - -#include -#include - -struct wlr_session { - sd_bus *bus; - - char *id; - char *path; - char *seat; -}; - -bool wlr_session_start(struct wlr_session *session); -void wlr_session_end(struct wlr_session *session); - -int wlr_session_take_device(struct wlr_session *restrict session, - const char *restrict path, - bool *restrict paused_out); - -void wlr_session_release_device(struct wlr_session *session, int fd); - -#endif diff --git a/include/backend/drm/udev.h b/include/backend/drm/udev.h index 576b5d6e5..a09ee2183 100644 --- a/include/backend/drm/udev.h +++ b/include/backend/drm/udev.h @@ -3,7 +3,7 @@ #include -#include "backend/drm/session.h" +#include struct wlr_udev { struct udev *udev; diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 5179db4bf..ede43fda5 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -2,13 +2,13 @@ #define WLR_BACKEND_DRM_H #include +#include struct wlr_drm_backend; struct wlr_drm_display; -struct wlr_drm_backend *wlr_drm_backend_init(struct wl_listener *add, - struct wl_listener *rem, - struct wl_listener *render); +struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, + struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render); void wlr_drm_backend_free(struct wlr_drm_backend *backend); struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend); diff --git a/session/logind.c b/session/logind.c index c81a20206..0d8a52b54 100644 --- a/session/logind.c +++ b/session/logind.c @@ -200,6 +200,9 @@ static struct wlr_session *logind_session_start(void) { if (!take_control(session)) goto error_bus; + wl_log(L_INFO, "Successfully loaded logind session"); + + session->base.iface = session_logind_iface; return &session->base; error_bus: diff --git a/session/session.c b/session/session.c index 88391e6eb..2f1b87be0 100644 --- a/session/session.c +++ b/session/session.c @@ -1,6 +1,8 @@ #include #include +#include +#include "common/log.h" #include "session/interface.h" static const struct session_interface *ifaces[] = { @@ -20,6 +22,7 @@ struct wlr_session *wlr_session_start(void) { } } + wlr_log(L_ERROR, "Failed to load session backend"); return NULL; } From dbceaee9faaaf24016024bd22b38fa0186bb5e08 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 17:04:41 +1200 Subject: [PATCH 11/21] Added EGL interface for backends. --- backend/CMakeLists.txt | 1 + backend/egl.c | 169 +++++++++++++++++++++++++++++++++++++++ include/backend/egl.h | 17 ++++ include/wlr/common/log.h | 1 + session/logind.c | 2 +- 5 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 backend/egl.c create mode 100644 include/backend/egl.h diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index ee8b04d66..938dc1aba 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -12,6 +12,7 @@ add_library(wlr-backend drm/backend.c drm/drm.c drm/udev.c + egl.c ) target_link_libraries(wlr-backend diff --git a/backend/egl.c b/backend/egl.c new file mode 100644 index 000000000..b6c498462 --- /dev/null +++ b/backend/egl.c @@ -0,0 +1,169 @@ +#include +#include +#include // GBM_FORMAT_XRGB8888 + +#include "backend/egl.h" +#include "common/log.h" + +static const char *egl_error(void) { + switch (eglGetError()) { + case EGL_SUCCESS: + return "Success"; + case EGL_NOT_INITIALIZED: + return "Not initialized"; + case EGL_BAD_ACCESS: + return "Bad access"; + case EGL_BAD_ALLOC: + return "Bad alloc"; + case EGL_BAD_ATTRIBUTE: + return "Bad attribute"; + case EGL_BAD_CONTEXT: + return "Bad Context"; + case EGL_BAD_CONFIG: + return "Bad Config"; + case EGL_BAD_CURRENT_SURFACE: + return "Bad current surface"; + case EGL_BAD_DISPLAY: + return "Bad display"; + case EGL_BAD_SURFACE: + return "Bad surface"; + case EGL_BAD_MATCH: + return "Bad match"; + case EGL_BAD_PARAMETER: + return "Bad parameter"; + case EGL_BAD_NATIVE_PIXMAP: + return "Bad native pixmap"; + case EGL_BAD_NATIVE_WINDOW: + return "Bad native window"; + case EGL_CONTEXT_LOST: + return "Context lost"; + default: + return "Unknown"; + } +} + +// EGL extensions +PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display; +PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface; + +static bool egl_exts() { + get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC) + eglGetProcAddress("eglGetPlatformDisplayEXT"); + + if (!get_platform_display) { + wlr_log(L_ERROR, "Failed to load EGL extension 'eglGetPlatformDisplayEXT'"); + return false; + } + + create_platform_window_surface = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) + eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); + + if (!get_platform_display) { + wlr_log(L_ERROR, + "Failed to load EGL extension 'eglCreatePlatformWindowSurfaceEXT'"); + return false; + } + + return true; +} + +static bool egl_get_config(EGLDisplay disp, EGLConfig *out) { + EGLint count = 0, matched = 0, ret; + + ret = eglGetConfigs(disp, NULL, 0, &count); + if (ret == EGL_FALSE || count == 0) { + return false; + } + + EGLConfig configs[count]; + + ret = eglChooseConfig(disp, NULL, configs, count, &matched); + if (ret == EGL_FALSE) { + return false; + } + + for (int i = 0; i < matched; ++i) { + EGLint gbm_format; + + if (!eglGetConfigAttrib(disp, + configs[i], + EGL_NATIVE_VISUAL_ID, + &gbm_format)) { + continue; + } + + // XXX: Is GBM_FORMAT_XRGB8888 what we want? + // I don't know if this works for wl_displays. + if (gbm_format == GBM_FORMAT_XRGB8888) { + *out = configs[i]; + return true; + } + } + + return false; +} + + +bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display) { + if (!egl_exts()) { + return false; + } + + if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) { + wlr_log(L_ERROR, "Failed to bind to the OpenGL ES API: %s", egl_error()); + goto error; + } + + egl->display = get_platform_display(platform, display, NULL); + if (egl->display == EGL_NO_DISPLAY) { + wlr_log(L_ERROR, "Failed to create EGL display: %s", egl_error()); + goto error; + } + + if (eglInitialize(egl->display, NULL, NULL) == EGL_FALSE) { + wlr_log(L_ERROR, "Failed to initialize EGL: %s", egl_error()); + goto error; + } + + if (!egl_get_config(egl->display, &egl->config)) { + wlr_log(L_ERROR, "Failed to get EGL config"); + goto error; + } + + static const EGLint attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE}; + + egl->context = eglCreateContext(egl->display, egl->config, + EGL_NO_CONTEXT, attribs); + + if (egl->context == EGL_NO_CONTEXT) { + wlr_log(L_ERROR, "Failed to create EGL context: %s", egl_error()); + goto error; + } + + return true; + +error: + eglTerminate(egl->display); + eglReleaseThread(); + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + + return false; +} + +void wlr_egl_free(struct wlr_egl *egl) { + eglDestroyContext(egl->display, egl->context); + eglTerminate(egl->display); + eglReleaseThread(); + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); +} + +EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window) { + EGLSurface surf = create_platform_window_surface(egl->display, egl->config, + window, NULL); + if (surf == EGL_NO_SURFACE) { + wlr_log(L_ERROR, "Failed to create EGL surface: %s", egl_error()); + return EGL_NO_SURFACE; + } + + return surf; +} diff --git a/include/backend/egl.h b/include/backend/egl.h new file mode 100644 index 000000000..8cef36b76 --- /dev/null +++ b/include/backend/egl.h @@ -0,0 +1,17 @@ +#ifndef WLR_BACKEND_EGL_H +#define WLR_BACKEND_EGL_H + +#include +#include + +struct wlr_egl { + EGLDisplay display; + EGLConfig config; + EGLContext context; +}; + +bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display); +void wlr_egl_free(struct wlr_egl *egl); +EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window); + +#endif diff --git a/include/wlr/common/log.h b/include/wlr/common/log.h index 5b4d5a53f..079f989a8 100644 --- a/include/wlr/common/log.h +++ b/include/wlr/common/log.h @@ -1,6 +1,7 @@ #ifndef _WLR_COMMON_LOG_H #define _WLR_COMMON_LOG_H #include +#include typedef enum { L_SILENT = 0, diff --git a/session/logind.c b/session/logind.c index 0d8a52b54..052c74540 100644 --- a/session/logind.c +++ b/session/logind.c @@ -200,7 +200,7 @@ static struct wlr_session *logind_session_start(void) { if (!take_control(session)) goto error_bus; - wl_log(L_INFO, "Successfully loaded logind session"); + wlr_log(L_INFO, "Successfully loaded logind session"); session->base.iface = session_logind_iface; return &session->base; From 15d247bf3455904bf2262d2bf5d27645c03c9399 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 17:17:14 +1200 Subject: [PATCH 12/21] Changed drm to use new EGL interface. --- backend/drm/drm.c | 155 +++----------------------------------- include/backend/drm/drm.h | 8 +- 2 files changed, 13 insertions(+), 150 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 470a76bbe..617dd74ae 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -37,103 +37,6 @@ static const char *conn_name[] = { [DRM_MODE_CONNECTOR_DSI] = "DSI", }; -static const char *egl_error(void) -{ - switch (eglGetError()) { - case EGL_SUCCESS: - return "Success"; - case EGL_NOT_INITIALIZED: - return "Not initialized"; - case EGL_BAD_ACCESS: - return "Bad access"; - case EGL_BAD_ALLOC: - return "Bad alloc"; - case EGL_BAD_ATTRIBUTE: - return "Bad attribute"; - case EGL_BAD_CONTEXT: - return "Bad Context"; - case EGL_BAD_CONFIG: - return "Bad Config"; - case EGL_BAD_CURRENT_SURFACE: - return "Bad current surface"; - case EGL_BAD_DISPLAY: - return "Bad display"; - case EGL_BAD_SURFACE: - return "Bad surface"; - case EGL_BAD_MATCH: - return "Bad match"; - case EGL_BAD_PARAMETER: - return "Bad parameter"; - case EGL_BAD_NATIVE_PIXMAP: - return "Bad native pixmap"; - case EGL_BAD_NATIVE_WINDOW: - return "Bad native window"; - case EGL_CONTEXT_LOST: - return "Context lost"; - default: - return "Unknown"; - } -} - -// EGL extensions -PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display; -PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface; - -static bool egl_exts() -{ - get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC) - eglGetProcAddress("eglGetPlatformDisplayEXT"); - - if (!get_platform_display) { - wlr_log(L_ERROR, "Failed to load EGL extension 'eglGetPlatformDisplayEXT'"); - return false; - } - - create_platform_window_surface = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) - eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); - - if (!get_platform_display) { - wlr_log(L_ERROR, "Failed to load EGL extension 'eglCreatePlatformWindowSurfaceEXT'"); - return false; - } - - return true; -} - -static bool egl_get_config(EGLDisplay disp, EGLConfig *out) -{ - EGLint count = 0, matched = 0, ret; - - ret = eglGetConfigs(disp, NULL, 0, &count); - if (ret == EGL_FALSE || count == 0) { - return false; - } - - EGLConfig configs[count]; - - ret = eglChooseConfig(disp, NULL, configs, count, &matched); - if (ret == EGL_FALSE) { - return false; - } - - for (int i = 0; i < matched; ++i) { - EGLint gbm_format; - - if (!eglGetConfigAttrib(disp, - configs[i], - EGL_NATIVE_VISUAL_ID, - &gbm_format)) - continue; - - if (gbm_format == GBM_FORMAT_XRGB8888) { - *out = configs[i]; - return true; - } - } - - return false; -} - static void page_flip_handler(int fd, unsigned seq, unsigned tv_sec, @@ -164,46 +67,16 @@ static int drm_event(int fd, uint32_t mask, void *data) bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, struct wlr_drm_backend *backend, int fd) { - if (!egl_exts()) - return false; - renderer->gbm = gbm_create_device(fd); if (!renderer->gbm) { wlr_log(L_ERROR, "Failed to create GBM device: %s", strerror(errno)); return false; } - if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) { - wlr_log(L_ERROR, "Failed to bind to the OpenGL ES API: %s", egl_error()); + if (!wlr_egl_init(&renderer->egl, EGL_PLATFORM_GBM_MESA, renderer->gbm)) { goto error_gbm; } - renderer->egl.disp = get_platform_display(EGL_PLATFORM_GBM_MESA, renderer->gbm, NULL); - if (renderer->egl.disp == EGL_NO_DISPLAY) { - wlr_log(L_ERROR, "Failed to create EGL display: %s", egl_error()); - goto error_gbm; - } - - if (eglInitialize(renderer->egl.disp, NULL, NULL) == EGL_FALSE) { - wlr_log(L_ERROR, "Failed to initialize EGL: %s", egl_error()); - goto error_egl; - } - - if (!egl_get_config(renderer->egl.disp, &renderer->egl.conf)) { - wlr_log(L_ERROR, "Failed to get EGL config"); - goto error_egl; - } - - static const EGLint attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE}; - - renderer->egl.context = eglCreateContext(renderer->egl.disp, - renderer->egl.conf, EGL_NO_CONTEXT, attribs); - - if (renderer->egl.context == EGL_NO_CONTEXT) { - wlr_log(L_ERROR, "Failed to create EGL context: %s", egl_error()); - goto error_egl; - } - backend->event_src.drm = wl_event_loop_add_fd(backend->event_loop, backend->fd, WL_EVENT_READABLE, drm_event, NULL); if (!backend->event_src.drm) { @@ -217,9 +90,7 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, return true; error_egl: - eglTerminate(renderer->egl.disp); - eglReleaseThread(); - eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + wlr_egl_free(&renderer->egl); error_gbm: gbm_device_destroy(renderer->gbm); @@ -232,11 +103,7 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) if (!renderer) return; - eglDestroyContext(renderer->egl.disp, renderer->egl.context); - eglTerminate(renderer->egl.disp); - eglReleaseThread(); - eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); - + wlr_egl_free(&renderer->egl); gbm_device_destroy(renderer->gbm); } @@ -360,23 +227,21 @@ static bool display_init_renderer(struct wlr_drm_renderer *renderer, return false; } - disp->egl = create_platform_window_surface(renderer->egl.disp, renderer->egl.conf, - disp->gbm, NULL); + disp->egl = wlr_egl_create_surface(&renderer->egl, disp->gbm); if (disp->egl == EGL_NO_SURFACE) { - wlr_log(L_ERROR, "Failed to create EGL surface for %s: %s", disp->name, - egl_error()); + wlr_log(L_ERROR, "Failed to create EGL surface for %s", disp->name); return false; } // Render black frame - eglMakeCurrent(renderer->egl.disp, disp->egl, disp->egl, renderer->egl.context); + eglMakeCurrent(renderer->egl.display, disp->egl, disp->egl, renderer->egl.context); glViewport(0, 0, disp->width, disp->height); glClearColor(0.0, 0.0, 0.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); - eglSwapBuffers(renderer->egl.disp, disp->egl); + eglSwapBuffers(renderer->egl.display, disp->egl); struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); @@ -546,7 +411,7 @@ void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore) struct wlr_drm_renderer *renderer = disp->renderer; - eglDestroySurface(renderer->egl.disp, disp->egl); + eglDestroySurface(renderer->egl.display, disp->egl); gbm_surface_destroy(disp->gbm); free(disp->modes); @@ -578,13 +443,13 @@ void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore) void wlr_drm_display_begin(struct wlr_drm_display *disp) { struct wlr_drm_renderer *renderer = disp->renderer; - eglMakeCurrent(renderer->egl.disp, disp->egl, disp->egl, renderer->egl.context); + eglMakeCurrent(renderer->egl.display, disp->egl, disp->egl, renderer->egl.context); } void wlr_drm_display_end(struct wlr_drm_display *disp) { struct wlr_drm_renderer *renderer = disp->renderer; - eglSwapBuffers(renderer->egl.disp, disp->egl); + eglSwapBuffers(renderer->egl.display, disp->egl); struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 17d4aa908..346974cae 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -7,6 +7,8 @@ #include #include +#include "backend/egl.h" + struct wlr_drm_renderer { int fd; @@ -16,11 +18,7 @@ struct wlr_drm_renderer { struct wlr_drm_backend *backend; struct gbm_device *gbm; - struct { - EGLDisplay disp; - EGLConfig conf; - EGLContext context; - } egl; + struct wlr_egl egl; }; bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, From 18387468bb9936d0e311c4a46535cfa93df277dc Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 17:49:03 +1200 Subject: [PATCH 13/21] Renamed 'wlr_drm_display' to 'wlr_drm_output' --- backend/drm/backend.c | 30 ++-- backend/drm/drm.c | 277 +++++++++++++++++----------------- example/example-drm.c | 26 ++-- include/backend/drm/backend.h | 8 +- include/backend/drm/drm.h | 22 +-- include/wlr/backend/drm.h | 8 +- 6 files changed, 184 insertions(+), 187 deletions(-) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 9f9a02c72..03e34d978 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -23,8 +23,8 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, backend->session = session; - backend->displays = list_create(); - if (!backend->displays) { + backend->outputs = list_create(); + if (!backend->outputs) { wlr_log(L_ERROR, "Failed to allocate list"); goto error_backend; } @@ -51,16 +51,16 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, goto error_fd; } - wl_signal_init(&backend->signals.display_add); - wl_signal_init(&backend->signals.display_rem); - wl_signal_init(&backend->signals.display_render); + wl_signal_init(&backend->signals.output_add); + wl_signal_init(&backend->signals.output_rem); + wl_signal_init(&backend->signals.output_render); if (add) - wl_signal_add(&backend->signals.display_add, add); + wl_signal_add(&backend->signals.output_add, add); if (rem) - wl_signal_add(&backend->signals.display_rem, rem); + wl_signal_add(&backend->signals.output_rem, rem); if (render) - wl_signal_add(&backend->signals.display_render, render); + wl_signal_add(&backend->signals.output_render, render); wlr_drm_scan_connectors(backend); @@ -73,17 +73,17 @@ error_udev: error_loop: wl_event_loop_destroy(backend->event_loop); error_list: - list_free(backend->displays); + list_free(backend->outputs); error_backend: free(backend); return NULL; } -static void free_display(void *item) +static void free_output(void *item) { - struct wlr_drm_display *disp = item; - wlr_drm_display_free(disp, true); - free(disp); + struct wlr_drm_output *out = item; + wlr_drm_output_free(out, true); + free(out); } void wlr_drm_backend_free(struct wlr_drm_backend *backend) @@ -91,7 +91,7 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) if (!backend) return; - list_foreach(backend->displays, free_display); + list_foreach(backend->outputs, free_output); wlr_drm_renderer_free(&backend->renderer); wlr_udev_free(&backend->udev); @@ -102,7 +102,7 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) wl_event_source_remove(backend->event_src.udev); wl_event_loop_destroy(backend->event_loop); - list_free(backend->displays); + list_free(backend->outputs); free(backend); } diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 617dd74ae..139716872 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -37,23 +37,19 @@ static const char *conn_name[] = { [DRM_MODE_CONNECTOR_DSI] = "DSI", }; -static void page_flip_handler(int fd, - unsigned seq, - unsigned tv_sec, - unsigned tv_usec, - void *user) -{ - struct wlr_drm_display *disp = user; - struct wlr_drm_backend *backend = disp->renderer->backend; +static void page_flip_handler(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, + void *user) { - disp->pageflip_pending = true; - if (!disp->cleanup) - wl_signal_emit(&backend->signals.display_render, disp); + struct wlr_drm_output *out = user; + struct wlr_drm_backend *backend = out->renderer->backend; + + out->pageflip_pending = true; + if (!out->cleanup) { + wl_signal_emit(&backend->signals.output_render, out); + } } - -static int drm_event(int fd, uint32_t mask, void *data) -{ +static int drm_event(int fd, uint32_t mask, void *data) { drmEventContext event = { .version = DRM_EVENT_CONTEXT_VERSION, .page_flip_handler = page_flip_handler, @@ -65,8 +61,8 @@ static int drm_event(int fd, uint32_t mask, void *data) } bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, - struct wlr_drm_backend *backend, int fd) -{ + struct wlr_drm_backend *backend, int fd) { + renderer->gbm = gbm_create_device(fd); if (!renderer->gbm) { wlr_log(L_ERROR, "Failed to create GBM device: %s", strerror(errno)); @@ -98,30 +94,29 @@ error_gbm: return false; } -void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) -{ - if (!renderer) +void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) { + if (!renderer) { return; + } wlr_egl_free(&renderer->egl); gbm_device_destroy(renderer->gbm); } -static int find_id(const void *item, const void *cmp_to) -{ - const struct wlr_drm_display *disp = item; +static int find_id(const void *item, const void *cmp_to) { + const struct wlr_drm_output *out = item; const uint32_t *id = cmp_to; - if (disp->connector < *id) + if (out->connector < *id) { return -1; - else if (disp->connector > *id) + } else if (out->connector > *id) { return 1; - else + } else { return 0; + } } -void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) -{ +void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { drmModeRes *res = drmModeGetResources(backend->fd); if (!res) { wlr_log(L_ERROR, "Failed to get DRM resources"); @@ -137,42 +132,44 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) continue; } - struct wlr_drm_display *disp; - int index = list_seq_find(backend->displays, find_id, &id); + struct wlr_drm_output *out; + int index = list_seq_find(backend->outputs, find_id, &id); if (index == -1) { - disp = calloc(1, sizeof *disp); - if (!disp) { + out = calloc(1, sizeof *out); + if (!out) { wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); drmModeFreeConnector(conn); continue; } - disp->renderer = &backend->renderer; - disp->state = DRM_DISP_DISCONNECTED; - disp->connector = res->connectors[i]; - snprintf(disp->name, sizeof disp->name, "%s-%"PRIu32, + out->renderer = &backend->renderer; + out->state = DRM_OUTPUT_DISCONNECTED; + out->connector = res->connectors[i]; + snprintf(out->name, sizeof out->name, "%s-%"PRIu32, conn_name[conn->connector_type], conn->connector_type_id); - list_add(backend->displays, disp); - wlr_log(L_INFO, "Found display '%s'", disp->name); + list_add(backend->outputs, out); + wlr_log(L_INFO, "Found display '%s'", out->name); } else { - disp = backend->displays->items[index]; + out = backend->outputs->items[index]; } - if (disp->state == DRM_DISP_DISCONNECTED && - conn->connection == DRM_MODE_CONNECTED) { - disp->state = DRM_DISP_NEEDS_MODESET; - wlr_log(L_INFO, "Sending modesetting signal for '%s'", disp->name); - wl_signal_emit(&backend->signals.display_add, disp); + if (out->state == DRM_OUTPUT_DISCONNECTED && + conn->connection == DRM_MODE_CONNECTED) { - } else if (disp->state == DRM_DISP_CONNECTED && - conn->connection != DRM_MODE_CONNECTED) { - disp->state = DRM_DISP_DISCONNECTED; - wlr_drm_display_free(disp, false); - wlr_log(L_INFO, "Sending destruction signal for '%s'", disp->name); - wl_signal_emit(&backend->signals.display_rem, disp); + out->state = DRM_OUTPUT_NEEDS_MODESET; + wlr_log(L_INFO, "Sending modesetting signal for '%s'", out->name); + wl_signal_emit(&backend->signals.output_add, out); + + } else if (out->state == DRM_OUTPUT_CONNECTED && + conn->connection != DRM_MODE_CONNECTED) { + + out->state = DRM_OUTPUT_DISCONNECTED; + wlr_drm_output_free(out, false); + wlr_log(L_INFO, "Sending destruction signal for '%s'", out->name); + wl_signal_emit(&backend->signals.output_rem, out); } drmModeFreeConnector(conn); @@ -181,22 +178,22 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) drmModeFreeResources(res); } -static void free_fb(struct gbm_bo *bo, void *data) -{ +static void free_fb(struct gbm_bo *bo, void *data) { uint32_t *id = data; - if (id && *id) + if (id && *id) { drmModeRmFB(gbm_bo_get_fd(bo), *id); + } free(id); } -static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) -{ +static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) { uint32_t *id = gbm_bo_get_user_data(bo); - if (id) + if (id) { return *id; + } id = calloc(1, sizeof *id); if (!id) { @@ -213,55 +210,52 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) } static bool display_init_renderer(struct wlr_drm_renderer *renderer, - struct wlr_drm_display *disp) -{ - disp->renderer = renderer; + struct wlr_drm_output *out) { - disp->gbm = gbm_surface_create(renderer->gbm, - disp->width, disp->height, - GBM_FORMAT_XRGB8888, - GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); - if (!disp->gbm) { - wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", disp->name, + 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, strerror(errno)); return false; } - disp->egl = wlr_egl_create_surface(&renderer->egl, disp->gbm); - if (disp->egl == EGL_NO_SURFACE) { - wlr_log(L_ERROR, "Failed to create EGL surface for %s", disp->name); + 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); return false; } // Render black frame - eglMakeCurrent(renderer->egl.display, disp->egl, disp->egl, renderer->egl.context); + eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context); - glViewport(0, 0, disp->width, disp->height); + glViewport(0, 0, out->width, out->height); glClearColor(0.0, 0.0, 0.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); - eglSwapBuffers(renderer->egl.display, disp->egl); + eglSwapBuffers(renderer->egl.display, out->egl); - struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); + struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->gbm); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); - drmModeSetCrtc(renderer->fd, disp->crtc, fb_id, 0, 0, - &disp->connector, 1, disp->active_mode); - drmModePageFlip(renderer->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); + drmModeSetCrtc(renderer->fd, out->crtc, fb_id, 0, 0, + &out->connector, 1, out->active_mode); + drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out); - gbm_surface_release_buffer(disp->gbm, bo); + gbm_surface_release_buffer(out->gbm, bo); return true; } -static drmModeModeInfo *select_mode(size_t num_modes, - drmModeModeInfo modes[static num_modes], - drmModeCrtc *old_crtc, - const char *str) -{ - if (strcmp(str, "preferred") == 0) +static drmModeModeInfo *select_mode(size_t num_modes, drmModeModeInfo modes[static num_modes], + drmModeCrtc *old_crtc, const char *str) { + + if (strcmp(str, "preferred") == 0) { return &modes[0]; + } if (strcmp(str, "current") == 0) { if (!old_crtc) { @@ -270,8 +264,9 @@ static drmModeModeInfo *select_mode(size_t num_modes, } for (size_t i = 0; i < num_modes; ++i) { - if (memcmp(&modes[i], &old_crtc->mode, sizeof modes[0]) == 0) + if (memcmp(&modes[i], &old_crtc->mode, sizeof modes[0]) == 0) { return &modes[i]; + } } // We should never get here @@ -289,55 +284,57 @@ static drmModeModeInfo *select_mode(size_t num_modes, } for (size_t i = 0; i < num_modes; ++i) { - if (modes[i].hdisplay == width && - modes[i].vdisplay == height && - (!rate || modes[i].vrefresh == rate)) + if (modes[i].hdisplay == width && modes[i].vdisplay == height && + (!rate || modes[i].vrefresh == rate)) { + return &modes[i]; + } } wlr_log(L_ERROR, "Unable to find mode %ux%u@%u", width, height, rate); return NULL; } -bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str) -{ - struct wlr_drm_backend *backend = disp->renderer->backend; - wlr_log(L_INFO, "Modesetting %s with '%s'", disp->name, str); +bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str) { + struct wlr_drm_backend *backend = out->renderer->backend; + wlr_log(L_INFO, "Modesetting %s with '%s'", out->name, str); - drmModeConnector *conn = drmModeGetConnector(backend->fd, disp->connector); + drmModeConnector *conn = drmModeGetConnector(backend->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", disp->name); + wlr_log(L_ERROR, "%s is not connected", out->name); goto error; } - disp->num_modes = conn->count_modes; - disp->modes = malloc(sizeof *disp->modes * disp->num_modes); - if (!disp->modes) { + out->num_modes = conn->count_modes; + out->modes = malloc(sizeof *out->modes * out->num_modes); + if (!out->modes) { wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); goto error; } - memcpy(disp->modes, conn->modes, sizeof *disp->modes * disp->num_modes); + memcpy(out->modes, conn->modes, sizeof *out->modes * out->num_modes); wlr_log(L_INFO, "Detected modes:"); - for (size_t i = 0; i < disp->num_modes; ++i) + for (size_t i = 0; i < out->num_modes; ++i) { wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32, - disp->modes[i].hdisplay, disp->modes[i].vdisplay, - disp->modes[i].vrefresh); + out->modes[i].hdisplay, out->modes[i].vdisplay, + out->modes[i].vrefresh); + } drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); if (curr_enc) { - disp->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); + out->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); free(curr_enc); } - disp->active_mode = select_mode(disp->num_modes, disp->modes, disp->old_crtc, str); - if (!disp->active_mode) { - wlr_log(L_ERROR, "Failed to configure %s", disp->name); + out->active_mode = select_mode(out->num_modes, out->modes, + out->old_crtc, str); + if (!out->active_mode) { + wlr_log(L_ERROR, "Failed to configure %s", out->name); goto error; } @@ -354,12 +351,13 @@ bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str) continue; for (int j = 0; j < res->count_crtcs; ++j) { - if ((enc->possible_crtcs & (1 << j)) == 0) + if ((enc->possible_crtcs & (1 << j)) == 0) { continue; + } if ((backend->taken_crtcs & (1 << j)) == 0) { backend->taken_crtcs |= 1 << j; - disp->crtc = res->crtcs[j]; + out->crtc = res->crtcs[j]; success = true; break; @@ -372,55 +370,56 @@ bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str) drmModeFreeResources(res); if (!success) { - wlr_log(L_ERROR, "Failed to find CRTC for %s", disp->name); + wlr_log(L_ERROR, "Failed to find CRTC for %s", out->name); goto error; } - disp->state = DRM_DISP_CONNECTED; + out->state = DRM_OUTPUT_CONNECTED; - disp->width = disp->active_mode->hdisplay; - disp->height = disp->active_mode->vdisplay; + out->width = out->active_mode->hdisplay; + out->height = out->active_mode->vdisplay; - if (!display_init_renderer(&backend->renderer, disp)) { - wlr_log(L_ERROR, "Failed to initalise renderer for %s", disp->name); + if (!display_init_renderer(&backend->renderer, out)) { + wlr_log(L_ERROR, "Failed to initalise renderer for %s", out->name); goto error; } drmModeFreeConnector(conn); wlr_log(L_INFO, "Configuring %s with mode %"PRIu16"x%"PRIu16"@%"PRIu32"", - disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay, - disp->active_mode->vrefresh); + out->name, out->active_mode->hdisplay, out->active_mode->vdisplay, + out->active_mode->vrefresh); return true; error: - disp->state = DRM_DISP_DISCONNECTED; + out->state = DRM_OUTPUT_DISCONNECTED; drmModeFreeConnector(conn); - free(disp->modes); + free(out->modes); - wl_signal_emit(&backend->signals.display_rem, disp); + wl_signal_emit(&backend->signals.output_rem, out); return false; } -void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore) -{ - if (!disp || disp->state != DRM_DISP_CONNECTED) +void wlr_drm_output_free(struct wlr_drm_output *out, bool restore) { + if (!out || out->state != DRM_OUTPUT_CONNECTED) { return; + } - struct wlr_drm_renderer *renderer = disp->renderer; + struct wlr_drm_renderer *renderer = out->renderer; - eglDestroySurface(renderer->egl.display, disp->egl); - gbm_surface_destroy(disp->gbm); + eglDestroySurface(renderer->egl.display, out->egl); + gbm_surface_destroy(out->gbm); - free(disp->modes); - disp->state = DRM_DISP_DISCONNECTED; + free(out->modes); + out->state = DRM_OUTPUT_DISCONNECTED; - if (!restore) + if (!restore) { return; + } - drmModeCrtc *crtc = disp->old_crtc; + drmModeCrtc *crtc = out->old_crtc; if (crtc) { // Wait for exising page flips to finish @@ -429,34 +428,32 @@ void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore) .page_flip_handler = page_flip_handler, }; - disp->cleanup = true; - while (disp->pageflip_pending) + out->cleanup = true; + while (out->pageflip_pending) drmHandleEvent(renderer->fd, &event); drmModeSetCrtc(renderer->fd, crtc->crtc_id, crtc->buffer_id, - crtc->x, crtc->y, &disp->connector, + crtc->x, crtc->y, &out->connector, 1, &crtc->mode); drmModeFreeCrtc(crtc); } } -void wlr_drm_display_begin(struct wlr_drm_display *disp) -{ - struct wlr_drm_renderer *renderer = disp->renderer; - eglMakeCurrent(renderer->egl.display, disp->egl, disp->egl, renderer->egl.context); +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_display_end(struct wlr_drm_display *disp) -{ - struct wlr_drm_renderer *renderer = disp->renderer; - eglSwapBuffers(renderer->egl.display, disp->egl); +void wlr_drm_output_end(struct wlr_drm_output *out) { + struct wlr_drm_renderer *renderer = out->renderer; + eglSwapBuffers(renderer->egl.display, out->egl); - struct gbm_bo *bo = gbm_surface_lock_front_buffer(disp->gbm); + struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->gbm); uint32_t fb_id = get_fb_for_bo(renderer->fd, bo); - drmModePageFlip(renderer->fd, disp->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, disp); + drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out); - gbm_surface_release_buffer(disp->gbm, bo); + gbm_surface_release_buffer(out->gbm, bo); - disp->pageflip_pending = false; + out->pageflip_pending = false; } diff --git a/example/example-drm.c b/example/example-drm.c index a3a2a8fda..072e5ce4e 100644 --- a/example/example-drm.c +++ b/example/example-drm.c @@ -19,22 +19,22 @@ struct state { struct wl_listener render; }; -void display_add(struct wl_listener *listener, void *data) +void output_add(struct wl_listener *listener, void *data) { - struct wlr_drm_display *disp = data; + struct wlr_drm_output *out = data; - fprintf(stderr, "Display added\n"); - wlr_drm_display_modeset(disp, "preferred"); + fprintf(stderr, "Output added\n"); + wlr_drm_output_modeset(out, "preferred"); } -void display_rem(struct wl_listener *listener, void *data) +void output_rem(struct wl_listener *listener, void *data) { - fprintf(stderr, "Display removed\n"); + fprintf(stderr, "Output removed\n"); } -void display_render(struct wl_listener *listener, void *data) +void output_render(struct wl_listener *listener, void *data) { - struct wlr_drm_display *disp = data; + struct wlr_drm_output *out = data; struct state *s = wl_container_of(listener, s, render); struct timespec now; @@ -56,12 +56,12 @@ void display_render(struct wl_listener *listener, void *data) s->last_frame = now; - wlr_drm_display_begin(disp); + wlr_drm_output_begin(out); glClearColor(s->color[0], s->color[1], s->color[2], 1.0); glClear(GL_COLOR_BUFFER_BIT); - wlr_drm_display_end(disp); + wlr_drm_output_end(out); } int timer_done(void *data) @@ -83,9 +83,9 @@ int main() struct state state = { .color = { 1.0, 0.0, 0.0 }, .dec = 0, - .add = { .notify = display_add }, - .rem = { .notify = display_rem }, - .render = { .notify = display_render }, + .add = { .notify = output_add }, + .rem = { .notify = output_rem }, + .render = { .notify = output_render }, }; wl_list_init(&state.add.link); diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index 32182d0c7..d6093bc28 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -28,12 +28,12 @@ struct wlr_drm_backend { } event_src; struct { - struct wl_signal display_add; - struct wl_signal display_rem; - struct wl_signal display_render; + struct wl_signal output_add; + struct wl_signal output_rem; + struct wl_signal output_render; } signals; - list_t *displays; + list_t *outputs; uint32_t taken_crtcs; diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 346974cae..6c3bb49f7 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -25,15 +25,15 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, struct wlr_drm_backend *backend, int fd); void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer); -enum wlr_drm_display_state { - DRM_DISP_INVALID, - DRM_DISP_DISCONNECTED, - DRM_DISP_NEEDS_MODESET, - DRM_DISP_CONNECTED, +enum wlr_drm_output_state { + DRM_OUTPUT_INVALID, + DRM_OUTPUT_DISCONNECTED, + DRM_OUTPUT_NEEDS_MODESET, + DRM_OUTPUT_CONNECTED, }; -struct wlr_drm_display { - enum wlr_drm_display_state state; +struct wlr_drm_output { + enum wlr_drm_output_state state; uint32_t connector; char name[16]; @@ -55,11 +55,11 @@ struct wlr_drm_display { bool cleanup; }; -bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str); -void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore); +bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str); +void wlr_drm_output_free(struct wlr_drm_output *out, bool restore); -void wlr_drm_display_begin(struct wlr_drm_display *disp); -void wlr_drm_display_end(struct wlr_drm_display *disp); +void wlr_drm_output_begin(struct wlr_drm_output *out); +void wlr_drm_output_end(struct wlr_drm_output *out); void wlr_drm_scan_connectors(struct wlr_drm_backend *backend); void wlr_drm_event(int fd); diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index ede43fda5..13679782d 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -5,7 +5,7 @@ #include struct wlr_drm_backend; -struct wlr_drm_display; +struct wlr_drm_output; struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render); @@ -13,8 +13,8 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend); struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend); -bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str); -void wlr_drm_display_begin(struct wlr_drm_display *disp); -void wlr_drm_display_end(struct wlr_drm_display *disp); +bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str); +void wlr_drm_output_begin(struct wlr_drm_output *out); +void wlr_drm_output_end(struct wlr_drm_output *out); #endif From 0002b8dd08fdab7da12127ad2f43238f376b1a7a Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 19:26:43 +1200 Subject: [PATCH 14/21] Added 'direct' session backend --- include/session/interface.h | 1 + session/CMakeLists.txt | 1 + session/direct.c | 50 +++++++++++++++++++++++++++++++++++++ session/session.c | 1 + 4 files changed, 53 insertions(+) create mode 100644 session/direct.c diff --git a/include/session/interface.h b/include/session/interface.h index 5dde89f00..a815718f1 100644 --- a/include/session/interface.h +++ b/include/session/interface.h @@ -16,5 +16,6 @@ struct wlr_session { }; extern const struct session_interface session_logind_iface; +extern const struct session_interface session_direct_iface; #endif diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt index 304f3220b..bd83068b1 100644 --- a/session/CMakeLists.txt +++ b/session/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( set(sources session.c + direct.c ) set(libs diff --git a/session/direct.c b/session/direct.c new file mode 100644 index 000000000..08a9b6178 --- /dev/null +++ b/session/direct.c @@ -0,0 +1,50 @@ +#define _POSIX_C_SOURCE 200809L + +#include +#include +#include +#include +#include +#include + +#include "session/interface.h" +#include "common/log.h" + +struct direct_session { + struct wlr_session base; +}; + +static int direct_session_open(struct wlr_session *restrict base, + const char *restrict path) { + return open(path, O_RDWR | O_CLOEXEC); +} + +static void direct_session_close(struct wlr_session *base, int fd) { + close(fd); +} + +static void direct_session_finish(struct wlr_session *base) { + struct direct_session *session = wl_container_of(base, session, base); + + free(session); +} + +static struct wlr_session *direct_session_start(void) { + struct direct_session *session = calloc(1, sizeof(*session)); + if (!session) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return NULL; + } + + wlr_log(L_INFO, "Successfully loaded direct session"); + + session->base.iface = session_direct_iface; + return &session->base; +} + +const struct session_interface session_direct_iface = { + .start = direct_session_start, + .finish = direct_session_finish, + .open = direct_session_open, + .close = direct_session_close, +}; diff --git a/session/session.c b/session/session.c index 2f1b87be0..0562dbf7c 100644 --- a/session/session.c +++ b/session/session.c @@ -9,6 +9,7 @@ static const struct session_interface *ifaces[] = { #ifdef HAS_SYSTEMD &session_logind_iface, #endif + &session_direct_iface, NULL, }; From d196a79b6c493d74d0057d74238353180d717255 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 21:28:44 +1200 Subject: [PATCH 15/21] Changed backend to accept wl_display. --- backend/drm/backend.c | 53 ++++++++++--------- backend/drm/drm.c | 29 +++------- backend/drm/udev.c | 99 ++++++++++++++++++++--------------- example/example-drm.c | 6 ++- include/backend/drm/backend.h | 14 +---- include/backend/drm/drm.h | 5 +- include/backend/drm/udev.h | 5 +- include/wlr/backend/drm.h | 7 ++- 8 files changed, 106 insertions(+), 112 deletions(-) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 03e34d978..5d72d9dcc 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -12,9 +13,10 @@ #include "backend/drm/udev.h" #include "common/log.h" -struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, - struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render) -{ +struct wlr_drm_backend *wlr_drm_backend_init(struct wl_display *display, + struct wlr_session *session, struct wl_listener *add, struct wl_listener *rem, + struct wl_listener *render) { + struct wlr_drm_backend *backend = calloc(1, sizeof *backend); if (!backend) { wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); @@ -29,15 +31,9 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, goto error_backend; } - backend->event_loop = wl_event_loop_create(); - if (!backend->event_loop) { - wlr_log(L_ERROR, "Failed to create event loop"); - goto error_list; - } - - if (!wlr_udev_init(backend)) { + if (!wlr_udev_init(display, &backend->udev)) { wlr_log(L_ERROR, "Failed to start udev"); - goto error_loop; + goto error_list; } backend->fd = wlr_udev_find_gpu(&backend->udev, backend->session); @@ -46,32 +42,44 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, goto error_udev; } - if (!wlr_drm_renderer_init(&backend->renderer, backend, backend->fd)) { - wlr_log(L_ERROR, "Failed to initialize renderer"); + struct wl_event_loop *event_loop = wl_display_get_event_loop(display); + + backend->drm_event = wl_event_loop_add_fd(event_loop, backend->fd, + WL_EVENT_READABLE, wlr_drm_event, NULL); + if (!backend->drm_event) { + wlr_log(L_ERROR, "Failed to create DRM event source"); goto error_fd; } + if (!wlr_drm_renderer_init(&backend->renderer, backend->fd)) { + wlr_log(L_ERROR, "Failed to initialize renderer"); + goto error_event; + } + wl_signal_init(&backend->signals.output_add); wl_signal_init(&backend->signals.output_rem); wl_signal_init(&backend->signals.output_render); - if (add) + if (add) { wl_signal_add(&backend->signals.output_add, add); - if (rem) + } + if (rem) { wl_signal_add(&backend->signals.output_rem, rem); - if (render) + } + if (render) { wl_signal_add(&backend->signals.output_render, render); + } wlr_drm_scan_connectors(backend); return backend; +error_event: + wl_event_source_remove(backend->drm_event); error_fd: wlr_session_close_file(backend->session, backend->fd); error_udev: wlr_udev_free(&backend->udev); -error_loop: - wl_event_loop_destroy(backend->event_loop); error_list: list_free(backend->outputs); error_backend: @@ -98,15 +106,8 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend) wlr_session_close_file(backend->session, backend->fd); wlr_session_finish(backend->session); - wl_event_source_remove(backend->event_src.drm); - wl_event_source_remove(backend->event_src.udev); - wl_event_loop_destroy(backend->event_loop); + wl_event_source_remove(backend->drm_event); list_free(backend->outputs); free(backend); } - -struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend) -{ - return backend->event_loop; -} diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 139716872..f636c42c7 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -41,7 +41,7 @@ static void page_flip_handler(int fd, unsigned seq, unsigned tv_sec, unsigned tv void *user) { struct wlr_drm_output *out = user; - struct wlr_drm_backend *backend = out->renderer->backend; + struct wlr_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); out->pageflip_pending = true; if (!out->cleanup) { @@ -49,7 +49,7 @@ static void page_flip_handler(int fd, unsigned seq, unsigned tv_sec, unsigned tv } } -static int drm_event(int fd, uint32_t mask, void *data) { +int wlr_drm_event(int fd, uint32_t mask, void *data) { drmEventContext event = { .version = DRM_EVENT_CONTEXT_VERSION, .page_flip_handler = page_flip_handler, @@ -60,8 +60,7 @@ static int drm_event(int fd, uint32_t mask, void *data) { return 1; } -bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, - struct wlr_drm_backend *backend, int fd) { +bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) { renderer->gbm = gbm_create_device(fd); if (!renderer->gbm) { @@ -70,28 +69,12 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, } if (!wlr_egl_init(&renderer->egl, EGL_PLATFORM_GBM_MESA, renderer->gbm)) { - goto error_gbm; - } - - backend->event_src.drm = wl_event_loop_add_fd(backend->event_loop, - backend->fd, WL_EVENT_READABLE, drm_event, NULL); - if (!backend->event_src.drm) { - wlr_log(L_ERROR, "Failed to create DRM event source"); - goto error_egl; + gbm_device_destroy(renderer->gbm); + return false; } renderer->fd = fd; - renderer->backend = backend; - return true; - -error_egl: - wlr_egl_free(&renderer->egl); - -error_gbm: - gbm_device_destroy(renderer->gbm); - - return false; } void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) { @@ -296,7 +279,7 @@ static drmModeModeInfo *select_mode(size_t num_modes, drmModeModeInfo modes[stat } bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str) { - struct wlr_drm_backend *backend = out->renderer->backend; + struct wlr_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); wlr_log(L_INFO, "Modesetting %s with '%s'", out->name, str); drmModeConnector *conn = drmModeGetConnector(backend->fd, out->connector); diff --git a/backend/drm/udev.c b/backend/drm/udev.c index 6921a9982..438047d60 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -16,36 +16,39 @@ #include "backend/drm/drm.h" #include "common/log.h" -static bool device_is_kms(struct wlr_udev *udev, - struct wlr_session *session, - struct udev_device *dev, - int *fd_out) -{ - const char *path = udev_device_get_devnode(dev); +/* Tests if 'path' is KMS compatible by trying to open it. + * It leaves the open device in *fd_out it it succeeds. + */ +static bool device_is_kms(struct wlr_session *restrict session, + const char *restrict path, int *restrict fd_out) { + int fd; - if (!path) + if (!path) { return false; + } fd = wlr_session_open_file(session, path); - if (fd < 0) + if (fd < 0) { return false; + } drmModeRes *res = drmModeGetResources(fd); - if (!res) + if (!res) { goto out_fd; + } if (res->count_crtcs <= 0 || res->count_connectors <= 0 || - res->count_encoders <= 0) + res->count_encoders <= 0) { + goto out_res; + } if (*fd_out >= 0) { wlr_session_close_file(session, *fd_out); - free(udev->drm_path); } *fd_out = fd; - udev->drm_path = strdup(path); drmModeFreeResources(res); return true; @@ -57,10 +60,10 @@ out_fd: return false; } -int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) -{ - int fd = -1; - +/* Tries to find the primary GPU by checking for the "boot_vga" attribute. + * If it's not found, it returns the first valid GPU it finds. + */ +int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) { struct udev_enumerate *en = udev_enumerate_new(udev->udev); if (!en) { wlr_log(L_ERROR, "Failed to create udev enumeration"); @@ -69,16 +72,20 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) udev_enumerate_add_match_subsystem(en, "drm"); udev_enumerate_add_match_sysname(en, "card[0-9]*"); - udev_enumerate_scan_devices(en); + struct udev_list_entry *entry; + int fd = -1; + char *drm_path = NULL; + udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(en)) { bool is_boot_vga = false; const char *path = udev_list_entry_get_name(entry); struct udev_device *dev = udev_device_new_from_syspath(udev->udev, path); - if (!dev) + if (!dev) { continue; + } /* const char *seat = udev_device_get_property_value(dev, "ID_SEAT"); @@ -90,14 +97,15 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) } */ + // This is owned by 'dev', so we don't need to free it struct udev_device *pci = udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL); if (pci) { const char *id = udev_device_get_sysattr_value(pci, "boot_vga"); - if (id && strcmp(id, "1") == 0) + if (id && strcmp(id, "1") == 0) { is_boot_vga = true; - //udev_device_unref(pci); + } } // We already have a valid GPU @@ -106,38 +114,47 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) continue; } - if (!device_is_kms(udev, session, dev, &fd)) { + path = udev_device_get_devnode(dev); + if (!device_is_kms(session, path, &fd)) { udev_device_unref(dev); continue; } + free(drm_path); + drm_path = strdup(path); + udev_device_unref(dev); - if (is_boot_vga) + // We've found the primary GPU + if (is_boot_vga) { break; + } } udev_enumerate_unref(en); + udev->drm_path = drm_path; return fd; } -static int udev_event(int fd, uint32_t mask, void *data) -{ - struct wlr_drm_backend *backend = data; - struct wlr_udev *udev = &backend->udev; +static int udev_event(int fd, uint32_t mask, void *data) { + struct wlr_udev *udev = data; + struct wlr_drm_backend *backend = wl_container_of(udev, backend, udev); struct udev_device *dev = udev_monitor_receive_device(udev->mon); - if (!dev) + if (!dev) { return 1; + } const char *path = udev_device_get_devnode(dev); - if (!path || strcmp(path, udev->drm_path) != 0) + if (!path || strcmp(path, udev->drm_path) != 0) { goto out; + } const char *action = udev_device_get_action(dev); - if (!action || strcmp(action, "change") != 0) + if (!action || strcmp(action, "change") != 0) { goto out; + } wlr_drm_scan_connectors(backend); @@ -146,10 +163,7 @@ out: return 1; } -bool wlr_udev_init(struct wlr_drm_backend *backend) -{ - struct wlr_udev *udev = &backend->udev; - +bool wlr_udev_init(struct wl_display *display, struct wlr_udev *udev) { udev->udev = udev_new(); if (!udev->udev) { wlr_log(L_ERROR, "Failed to create udev context"); @@ -165,10 +179,12 @@ bool wlr_udev_init(struct wlr_drm_backend *backend) udev_monitor_filter_add_match_subsystem_devtype(udev->mon, "drm", NULL); udev_monitor_enable_receiving(udev->mon); - backend->event_src.udev = wl_event_loop_add_fd(backend->event_loop, - udev_monitor_get_fd(udev->mon), WL_EVENT_READABLE, - udev_event, backend); - if (!backend->event_src.udev) { + struct wl_event_loop *event_loop = wl_display_get_event_loop(display); + int fd = udev_monitor_get_fd(udev->mon); + + udev->event = wl_event_loop_add_fd(event_loop, fd, WL_EVENT_READABLE, + udev_event, udev); + if (!udev->event) { wlr_log(L_ERROR, "Failed to create udev event source"); goto error_mon; } @@ -184,11 +200,12 @@ error_udev: return false; } -void wlr_udev_free(struct wlr_udev *udev) - -{ - if (!udev) +void wlr_udev_free(struct wlr_udev *udev) { + if (!udev) { return; + } + + wl_event_source_remove(udev->event); udev_monitor_unref(udev->mon); udev_unref(udev->udev); diff --git a/example/example-drm.c b/example/example-drm.c index 072e5ce4e..35a4f9a26 100644 --- a/example/example-drm.c +++ b/example/example-drm.c @@ -93,16 +93,18 @@ int main() wl_list_init(&state.render.link); clock_gettime(CLOCK_MONOTONIC, &state.last_frame); + struct wl_display *display = wl_display_create(); + struct wl_event_loop *event_loop = wl_display_get_event_loop(display); + struct wlr_session *session = wlr_session_start(); if (!session) { return 1; } - struct wlr_drm_backend *wlr = wlr_drm_backend_init(session, + struct wlr_drm_backend *wlr = wlr_drm_backend_init(display, session, &state.add, &state.rem, &state.render); bool done = false; - struct wl_event_loop *event_loop = wlr_drm_backend_get_event_loop(wlr); struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, timer_done, &done); diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index d6093bc28..8689c010c 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -20,12 +20,7 @@ struct wlr_drm_backend { int fd; bool paused; - struct wl_event_loop *event_loop; - - struct { - struct wl_event_source *drm; - struct wl_event_source *udev; - } event_src; + struct wl_event_source *drm_event; struct { struct wl_signal output_add; @@ -33,17 +28,12 @@ struct wlr_drm_backend { struct wl_signal output_render; } signals; - list_t *outputs; - uint32_t taken_crtcs; + list_t *outputs; struct wlr_drm_renderer renderer; struct wlr_session *session; struct wlr_udev udev; }; -struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, - struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render); -void wlr_drm_backend_free(struct wlr_drm_backend *backend); - #endif diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 6c3bb49f7..3373f024f 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -21,8 +21,7 @@ struct wlr_drm_renderer { struct wlr_egl egl; }; -bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, - struct wlr_drm_backend *backend, int fd); +bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd); void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer); enum wlr_drm_output_state { @@ -62,6 +61,6 @@ void wlr_drm_output_begin(struct wlr_drm_output *out); void wlr_drm_output_end(struct wlr_drm_output *out); void wlr_drm_scan_connectors(struct wlr_drm_backend *backend); -void wlr_drm_event(int fd); +int wlr_drm_event(int fd, uint32_t mask, void *data); #endif diff --git a/include/backend/drm/udev.h b/include/backend/drm/udev.h index a09ee2183..99c2c4038 100644 --- a/include/backend/drm/udev.h +++ b/include/backend/drm/udev.h @@ -4,15 +4,18 @@ #include #include +#include struct wlr_udev { struct udev *udev; struct udev_monitor *mon; char *drm_path; + + struct wl_event_source *event; }; struct wlr_drm_backend; -bool wlr_udev_init(struct wlr_drm_backend *backend); +bool wlr_udev_init(struct wl_display *display, struct wlr_udev *udev); void wlr_udev_free(struct wlr_udev *udev); int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session); diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 13679782d..d56c7e77c 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -7,12 +7,11 @@ struct wlr_drm_backend; struct wlr_drm_output; -struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session, - struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render); +struct wlr_drm_backend *wlr_drm_backend_init(struct wl_display *display, + struct wlr_session *session, struct wl_listener *add, struct wl_listener *rem, + struct wl_listener *render); void wlr_drm_backend_free(struct wlr_drm_backend *backend); -struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend); - bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str); void wlr_drm_output_begin(struct wlr_drm_output *out); void wlr_drm_output_end(struct wlr_drm_output *out); From ef9768858e5befde26db2cc4fec26a5e5bd0fe22 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 22:40:19 +1200 Subject: [PATCH 16/21] Changed modesetting interface. --- backend/drm/backend.c | 2 +- backend/drm/drm.c | 407 ++++++++++++++++++-------------------- example/CMakeLists.txt | 4 + example/example-drm.c | 7 +- include/backend/drm/drm.h | 11 +- include/wlr/backend/drm.h | 12 +- 6 files changed, 218 insertions(+), 225 deletions(-) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 5d72d9dcc..42e7f5fd5 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -90,7 +90,7 @@ error_backend: static void free_output(void *item) { struct wlr_drm_output *out = item; - wlr_drm_output_free(out, true); + wlr_drm_output_cleanup(out, true); free(out); } diff --git a/backend/drm/drm.c b/backend/drm/drm.c index f636c42c7..fc2626c51 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -37,29 +37,6 @@ static const char *conn_name[] = { [DRM_MODE_CONNECTOR_DSI] = "DSI", }; -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_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); - - out->pageflip_pending = true; - if (!out->cleanup) { - wl_signal_emit(&backend->signals.output_render, out); - } -} - -int wlr_drm_event(int fd, uint32_t mask, void *data) { - drmEventContext event = { - .version = DRM_EVENT_CONTEXT_VERSION, - .page_flip_handler = page_flip_handler, - }; - - drmHandleEvent(fd, &event); - - return 1; -} - bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) { renderer->gbm = gbm_create_device(fd); @@ -86,6 +63,97 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) { gbm_device_destroy(renderer->gbm); } +static void free_fb(struct gbm_bo *bo, void *data) { + uint32_t *id = data; + + if (id && *id) { + drmModeRmFB(gbm_bo_get_fd(bo), *id); + } + + free(id); +} + +static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) { + uint32_t *id = gbm_bo_get_user_data(bo); + + if (id) { + return *id; + } + + id = calloc(1, sizeof *id); + if (!id) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return 0; + } + + drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32, + gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id); + + gbm_bo_set_user_data(bo, id, free_fb); + + 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_end(struct wlr_drm_output *out) { + struct wlr_drm_renderer *renderer = out->renderer; + eglSwapBuffers(renderer->egl.display, out->egl); + + struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->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 = false; +} + +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, + 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); + return false; + } + + // Render black frame + + eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context); + + glViewport(0, 0, out->width, out->height); + glClearColor(0.0, 0.0, 0.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + + eglSwapBuffers(renderer->egl.display, out->egl); + + struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->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); + + return true; +} + static int find_id(const void *item, const void *cmp_to) { const struct wlr_drm_output *out = item; const uint32_t *id = cmp_to; @@ -142,6 +210,30 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { if (out->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, "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; + // TODO: Calculate more accurate refresh rate + out->modes[i].rate = mode->vrefresh; + out->modes[i].mode = *mode; + + 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(&backend->signals.output_add, out); @@ -149,138 +241,32 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { } else if (out->state == DRM_OUTPUT_CONNECTED && conn->connection != DRM_MODE_CONNECTED) { - out->state = DRM_OUTPUT_DISCONNECTED; - wlr_drm_output_free(out, false); + wlr_drm_output_cleanup(out, false); wlr_log(L_INFO, "Sending destruction signal for '%s'", out->name); wl_signal_emit(&backend->signals.output_rem, out); } - +error: drmModeFreeConnector(conn); } drmModeFreeResources(res); } -static void free_fb(struct gbm_bo *bo, void *data) { - uint32_t *id = data; - - if (id && *id) { - drmModeRmFB(gbm_bo_get_fd(bo), *id); - } - - free(id); -} - -static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) { - uint32_t *id = gbm_bo_get_user_data(bo); - - if (id) { - return *id; - } - - id = calloc(1, sizeof *id); - if (!id) { - wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); - return 0; - } - - drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32, - gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id); - - gbm_bo_set_user_data(bo, id, free_fb); - - return *id; -} - -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, - 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); - return false; - } - - // Render black frame - - eglMakeCurrent(renderer->egl.display, out->egl, out->egl, renderer->egl.context); - - glViewport(0, 0, out->width, out->height); - glClearColor(0.0, 0.0, 0.0, 1.0); - glClear(GL_COLOR_BUFFER_BIT); - - eglSwapBuffers(renderer->egl.display, out->egl); - - struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->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); - drmModePageFlip(renderer->fd, out->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, out); - - gbm_surface_release_buffer(out->gbm, bo); - - return true; -} - -static drmModeModeInfo *select_mode(size_t num_modes, drmModeModeInfo modes[static num_modes], - drmModeCrtc *old_crtc, const char *str) { - - if (strcmp(str, "preferred") == 0) { - return &modes[0]; - } - - if (strcmp(str, "current") == 0) { - if (!old_crtc) { - wlr_log(L_ERROR, "Display does not have currently configured mode"); - return NULL; - } - - for (size_t i = 0; i < num_modes; ++i) { - if (memcmp(&modes[i], &old_crtc->mode, sizeof modes[0]) == 0) { - return &modes[i]; - } - } - - // We should never get here - assert(0); - } - - unsigned width = 0; - unsigned height = 0; - unsigned rate = 0; - int ret; - - if ((ret = sscanf(str, "%ux%u@%u", &width, &height, &rate)) != 2 && ret != 3) { - wlr_log(L_ERROR, "Invalid modesetting string '%s'", str); +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; } - for (size_t i = 0; i < num_modes; ++i) { - if (modes[i].hdisplay == width && modes[i].vdisplay == height && - (!rate || modes[i].vrefresh == rate)) { - - return &modes[i]; - } - } - - wlr_log(L_ERROR, "Unable to find mode %ux%u@%u", width, height, rate); - return NULL; + *count = out->num_modes; + return out->modes; } -bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str) { +bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode) { struct wlr_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); - wlr_log(L_INFO, "Modesetting %s with '%s'", out->name, str); + + wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u'", out->name, mode->width, + mode->height, mode->rate); drmModeConnector *conn = drmModeGetConnector(backend->fd, out->connector); if (!conn) { @@ -293,34 +279,12 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str) { goto error; } - out->num_modes = conn->count_modes; - out->modes = malloc(sizeof *out->modes * out->num_modes); - if (!out->modes) { - wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); - goto error; - } - memcpy(out->modes, conn->modes, sizeof *out->modes * out->num_modes); - - wlr_log(L_INFO, "Detected modes:"); - for (size_t i = 0; i < out->num_modes; ++i) { - wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32, - out->modes[i].hdisplay, out->modes[i].vdisplay, - out->modes[i].vrefresh); - } - drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); if (curr_enc) { out->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); free(curr_enc); } - out->active_mode = select_mode(out->num_modes, out->modes, - out->old_crtc, str); - if (!out->active_mode) { - wlr_log(L_ERROR, "Failed to configure %s", out->name); - goto error; - } - drmModeRes *res = drmModeGetResources(backend->fd); if (!res) { wlr_log(L_ERROR, "Failed to get DRM resources"); @@ -358,9 +322,9 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str) { } out->state = DRM_OUTPUT_CONNECTED; - - out->width = out->active_mode->hdisplay; - out->height = out->active_mode->vdisplay; + out->active_mode = mode; + out->width = mode->width; + out->height = mode->height; if (!display_init_renderer(&backend->renderer, out)) { wlr_log(L_ERROR, "Failed to initalise renderer for %s", out->name); @@ -369,10 +333,6 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str) { drmModeFreeConnector(conn); - wlr_log(L_INFO, "Configuring %s with mode %"PRIu16"x%"PRIu16"@%"PRIu32"", - out->name, out->active_mode->hdisplay, out->active_mode->vdisplay, - out->active_mode->vrefresh); - return true; error: @@ -385,58 +345,79 @@ error: return false; } -void wlr_drm_output_free(struct wlr_drm_output *out, bool restore) { - if (!out || out->state != DRM_OUTPUT_CONNECTED) { - return; +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_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); + + out->pageflip_pending = true; + if (!out->cleanup) { + wl_signal_emit(&backend->signals.output_render, out); } +} - struct wlr_drm_renderer *renderer = out->renderer; +int wlr_drm_event(int fd, uint32_t mask, void *data) { + drmEventContext event = { + .version = DRM_EVENT_CONTEXT_VERSION, + .page_flip_handler = page_flip_handler, + }; - eglDestroySurface(renderer->egl.display, out->egl); - gbm_surface_destroy(out->gbm); + drmHandleEvent(fd, &event); - free(out->modes); - out->state = DRM_OUTPUT_DISCONNECTED; - - if (!restore) { - return; - } + return 1; +} +static void restore_output(struct wlr_drm_output *out, int fd) { drmModeCrtc *crtc = out->old_crtc; - if (crtc) { - // Wait for exising page flips to finish + if (!crtc) { + return; + } - drmEventContext event = { - .version = DRM_EVENT_CONTEXT_VERSION, - .page_flip_handler = page_flip_handler, - }; + // Wait for exising page flips to finish - out->cleanup = true; - while (out->pageflip_pending) - drmHandleEvent(renderer->fd, &event); + out->cleanup = true; + while (out->pageflip_pending) { + wlr_drm_event(fd, 0, NULL); + } - drmModeSetCrtc(renderer->fd, crtc->crtc_id, crtc->buffer_id, - crtc->x, crtc->y, &out->connector, - 1, &crtc->mode); - drmModeFreeCrtc(crtc); + drmModeSetCrtc(fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y, + &out->connector, 1, &crtc->mode); + drmModeFreeCrtc(crtc); +} + +void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) { + if (!out) { + return; + } + + struct wlr_drm_renderer *renderer = out->renderer; + + switch (out->state) { + case DRM_OUTPUT_CONNECTED: + eglDestroySurface(renderer->egl.display, out->egl); + gbm_surface_destroy(out->gbm); + + out->egl = EGL_NO_SURFACE; + out->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; + + if (restore) { + restore_output(out, renderer->fd); + } + + out->state = DRM_MODE_DISCONNECTED; + break; + + case DRM_OUTPUT_DISCONNECTED: + break; } } - -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_end(struct wlr_drm_output *out) { - struct wlr_drm_renderer *renderer = out->renderer; - eglSwapBuffers(renderer->egl.display, out->egl); - - struct gbm_bo *bo = gbm_surface_lock_front_buffer(out->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 = false; -} diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index fb2f3823d..29a776756 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,3 +1,7 @@ +include_directories( + ${DRM_INCLUDE_DIRS} +) + add_executable(example main.c ) diff --git a/example/example-drm.c b/example/example-drm.c index 35a4f9a26..a26439498 100644 --- a/example/example-drm.c +++ b/example/example-drm.c @@ -23,8 +23,10 @@ void output_add(struct wl_listener *listener, void *data) { struct wlr_drm_output *out = data; - fprintf(stderr, "Output added\n"); - wlr_drm_output_modeset(out, "preferred"); + size_t num_modes; + struct wlr_drm_mode *modes = wlr_drm_output_get_modes(out, &num_modes); + + wlr_drm_output_modeset(out, &modes[0]); } void output_rem(struct wl_listener *listener, void *data) @@ -115,4 +117,5 @@ int main() wl_event_source_remove(timer); wlr_drm_backend_free(wlr); + wl_display_destroy(display); } diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 3373f024f..daafc144e 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -25,7 +25,6 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd); void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer); enum wlr_drm_output_state { - DRM_OUTPUT_INVALID, DRM_OUTPUT_DISCONNECTED, DRM_OUTPUT_NEEDS_MODESET, DRM_OUTPUT_CONNECTED, @@ -37,8 +36,8 @@ struct wlr_drm_output { char name[16]; size_t num_modes; - drmModeModeInfo *modes; - drmModeModeInfo *active_mode; + struct wlr_drm_mode *modes; + struct wlr_drm_mode *active_mode; uint32_t width; uint32_t height; @@ -54,11 +53,7 @@ struct wlr_drm_output { bool cleanup; }; -bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str); -void wlr_drm_output_free(struct wlr_drm_output *out, bool restore); - -void wlr_drm_output_begin(struct wlr_drm_output *out); -void wlr_drm_output_end(struct wlr_drm_output *out); +void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore); void wlr_drm_scan_connectors(struct wlr_drm_backend *backend); int wlr_drm_event(int fd, uint32_t mask, void *data); diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index d56c7e77c..c3df24091 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -3,16 +3,26 @@ #include #include +#include // drmModeModeInfo struct wlr_drm_backend; struct wlr_drm_output; +struct wlr_drm_mode { + uint16_t width; + uint16_t height; + uint32_t rate; + drmModeModeInfo mode; +}; + struct wlr_drm_backend *wlr_drm_backend_init(struct wl_display *display, struct wlr_session *session, struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render); void wlr_drm_backend_free(struct wlr_drm_backend *backend); -bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str); +struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t *count); +bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode); + void wlr_drm_output_begin(struct wlr_drm_output *out); void wlr_drm_output_end(struct wlr_drm_output *out); From 4285b0c2187a401dc81d7535f0f0b82329cb0abb Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 May 2017 22:50:18 +1200 Subject: [PATCH 17/21] Removed unused fields. --- include/backend/drm/backend.h | 1 - include/backend/drm/drm.h | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index 8689c010c..bdda7ea7c 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -18,7 +18,6 @@ struct wlr_drm_backend { int fd; - bool paused; struct wl_event_source *drm_event; diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index daafc144e..51b0cdc67 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -12,11 +12,6 @@ struct wlr_drm_renderer { int fd; - // Currently here so that rendering has access to the event queue. - // Ideally this is will be removed later once the way events are - // handled is changed. - struct wlr_drm_backend *backend; - struct gbm_device *gbm; struct wlr_egl egl; }; From 7e9feb70a0b50caf7e9072d3b5c77b4e91235efa Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 4 May 2017 21:58:11 +1200 Subject: [PATCH 18/21] Fixed hotplugging + make EGL more chatty. --- backend/drm/drm.c | 52 +++++++++++++++++++++------------------ backend/egl.c | 11 ++++++++- example/example-drm.c | 4 ++- include/wlr/backend/drm.h | 2 ++ 4 files changed, 43 insertions(+), 26 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index fc2626c51..b5e5739a8 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -110,7 +110,7 @@ void wlr_drm_output_end(struct wlr_drm_output *out) { gbm_surface_release_buffer(out->gbm, bo); - out->pageflip_pending = false; + out->pageflip_pending = true; } static bool display_init_renderer(struct wlr_drm_renderer *renderer, @@ -168,6 +168,8 @@ static int find_id(const void *item, const void *cmp_to) { } void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { + wlr_log(L_INFO, "Scanning DRM connectors"); + drmModeRes *res = drmModeGetResources(backend->fd); if (!res) { wlr_log(L_ERROR, "Failed to get DRM resources"); @@ -196,11 +198,17 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { out->renderer = &backend->renderer; out->state = DRM_OUTPUT_DISCONNECTED; - out->connector = res->connectors[i]; + out->connector = id; snprintf(out->name, sizeof out->name, "%s-%"PRIu32, conn_name[conn->connector_type], conn->connector_type_id); + drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); + if (curr_enc) { + out->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); + free(curr_enc); + } + list_add(backend->outputs, out); wlr_log(L_INFO, "Found display '%s'", out->name); } else { @@ -241,9 +249,8 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { } 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); - wlr_log(L_INFO, "Sending destruction signal for '%s'", out->name); - wl_signal_emit(&backend->signals.output_rem, out); } error: drmModeFreeConnector(conn); @@ -279,12 +286,6 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mod goto error; } - drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); - if (curr_enc) { - out->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); - free(curr_enc); - } - drmModeRes *res = drmModeGetResources(backend->fd); if (!res) { wlr_log(L_ERROR, "Failed to get DRM resources"); @@ -336,11 +337,8 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mod return true; error: - out->state = DRM_OUTPUT_DISCONNECTED; + wlr_drm_output_cleanup(out, false); drmModeFreeConnector(conn); - free(out->modes); - - wl_signal_emit(&backend->signals.output_rem, out); return false; } @@ -351,8 +349,8 @@ static void page_flip_handler(int fd, unsigned seq, unsigned tv_sec, unsigned tv struct wlr_drm_output *out = user; struct wlr_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); - out->pageflip_pending = true; - if (!out->cleanup) { + out->pageflip_pending = false; + if (out->state == DRM_OUTPUT_CONNECTED) { wl_signal_emit(&backend->signals.output_render, out); } } @@ -369,18 +367,16 @@ int wlr_drm_event(int fd, uint32_t mask, void *data) { } static void restore_output(struct wlr_drm_output *out, int fd) { + // Wait for any pending pageflips to finish + while (out->pageflip_pending) { + wlr_drm_event(fd, 0, NULL); + } + drmModeCrtc *crtc = out->old_crtc; if (!crtc) { return; } - // Wait for exising page flips to finish - - out->cleanup = true; - while (out->pageflip_pending) { - wlr_drm_event(fd, 0, NULL); - } - drmModeSetCrtc(fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y, &out->connector, 1, &crtc->mode); drmModeFreeCrtc(crtc); @@ -392,6 +388,7 @@ void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) { } struct wlr_drm_renderer *renderer = out->renderer; + struct wlr_drm_backend *backend = wl_container_of(renderer, backend, renderer); switch (out->state) { case DRM_OUTPUT_CONNECTED: @@ -410,14 +407,21 @@ void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) { out->width = 0; out->height = 0; + out->state = DRM_OUTPUT_DISCONNECTED; + if (restore) { restore_output(out, renderer->fd); } - out->state = DRM_MODE_DISCONNECTED; + wlr_log(L_INFO, "Emmiting destruction signal for '%s'", out->name); + wl_signal_emit(&backend->signals.output_rem, out); break; case DRM_OUTPUT_DISCONNECTED: break; } } + +const char *wlr_drm_output_get_name(struct wlr_drm_output *out) { + return out->name; +} diff --git a/backend/egl.c b/backend/egl.c index b6c498462..2aac25b75 100644 --- a/backend/egl.c +++ b/backend/egl.c @@ -1,5 +1,6 @@ #include #include +#include #include // GBM_FORMAT_XRGB8888 #include "backend/egl.h" @@ -120,7 +121,8 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display) { goto error; } - if (eglInitialize(egl->display, NULL, NULL) == EGL_FALSE) { + EGLint major, minor; + if (eglInitialize(egl->display, &major, &minor) == EGL_FALSE) { wlr_log(L_ERROR, "Failed to initialize EGL: %s", egl_error()); goto error; } @@ -140,6 +142,13 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display) { goto error; } + eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl->context); + wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor); + wlr_log(L_INFO, "Supported EGL extensions: %s", eglQueryString(egl->display, + EGL_EXTENSIONS)); + wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION)); + wlr_log(L_INFO, "Supported OpenGL ES extensions: %s", glGetString(GL_EXTENSIONS)); + return true; error: diff --git a/example/example-drm.c b/example/example-drm.c index a26439498..1b1cce795 100644 --- a/example/example-drm.c +++ b/example/example-drm.c @@ -22,6 +22,7 @@ struct state { void output_add(struct wl_listener *listener, void *data) { struct wlr_drm_output *out = data; + fprintf(stderr, "Output '%s' added\n", wlr_drm_output_get_name(out)); size_t num_modes; struct wlr_drm_mode *modes = wlr_drm_output_get_modes(out, &num_modes); @@ -31,7 +32,8 @@ void output_add(struct wl_listener *listener, void *data) void output_rem(struct wl_listener *listener, void *data) { - fprintf(stderr, "Output removed\n"); + struct wlr_drm_output *out = data; + fprintf(stderr, "Output '%s' removed\n", wlr_drm_output_get_name(out)); } void output_render(struct wl_listener *listener, void *data) diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index c3df24091..4131b4cb5 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -20,6 +20,8 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wl_display *display, struct wl_listener *render); void wlr_drm_backend_free(struct wlr_drm_backend *backend); +const char *wlr_drm_output_get_name(struct wlr_drm_output *out); + struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t *count); bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode); From 15b1ce9e6ced22a90ab0df7a6b86c6d35c40ca93 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 7 May 2017 10:00:23 -0400 Subject: [PATCH 19/21] Refactor backend state management --- backend/CMakeLists.txt | 1 + backend/backend.c | 37 +++++++++++ backend/drm/backend.c | 113 ++++++++++++++++------------------ backend/drm/drm.c | 51 ++++++++------- backend/drm/udev.c | 5 +- example/example-drm.c | 51 +++++++-------- include/backend.h | 17 +++++ include/backend/drm/backend.h | 10 +-- include/backend/drm/drm.h | 3 +- include/wlr/backend.h | 27 +++++++- include/wlr/backend/drm.h | 7 +-- 11 files changed, 196 insertions(+), 126 deletions(-) create mode 100644 backend/backend.c create mode 100644 include/backend.h diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 938dc1aba..7183617ca 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -12,6 +12,7 @@ add_library(wlr-backend drm/backend.c drm/drm.c drm/udev.c + backend.c egl.c ) diff --git a/backend/backend.c b/backend/backend.c new file mode 100644 index 000000000..e40aaefec --- /dev/null +++ b/backend/backend.c @@ -0,0 +1,37 @@ +#include +#include +#include +#include +#include "common/log.h" +#include "backend.h" + +struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl, + struct wlr_backend_state *state) { + struct wlr_backend *backend = calloc(1, sizeof(struct wlr_backend)); + if (!backend) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return NULL; + } + backend->state = state; + 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); + wl_signal_init(&backend->events.pointer_remove); + wl_signal_init(&backend->events.touch_add); + wl_signal_init(&backend->events.touch_remove); + return backend; +} + +bool wlr_backend_init(struct wlr_backend *backend) { + return backend->impl->init(backend->state); +} + +void wlr_backend_destroy(struct wlr_backend *backend) { + backend->impl->destroy(backend->state); + // TODO: Free anything else? + free(backend); +} diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 42e7f5fd5..8c02669a3 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -8,106 +8,101 @@ #include #include +#include "backend.h" #include "backend/drm/backend.h" #include "backend/drm/drm.h" #include "backend/drm/udev.h" #include "common/log.h" -struct wlr_drm_backend *wlr_drm_backend_init(struct wl_display *display, - struct wlr_session *session, struct wl_listener *add, struct wl_listener *rem, - struct wl_listener *render) { +static bool wlr_drm_backend_init(struct wlr_backend_state *state) { + wlr_drm_scan_connectors(state); + return true; +} - struct wlr_drm_backend *backend = calloc(1, sizeof *backend); +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); + wlr_drm_renderer_free(&state->renderer); + wlr_udev_free(&state->udev); + wlr_session_close_file(state->session, state->fd); + wlr_session_finish(state->session); + wl_event_source_remove(state->drm_event); + free(state); +} + +static struct wlr_backend_impl backend_impl = { + .init = wlr_drm_backend_init, + .destroy = wlr_drm_backend_destroy +}; + +struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, + struct wlr_session *session) { + struct wlr_backend_state *state = calloc(1, sizeof(struct wlr_backend_state)); + if (!state) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return NULL; + } + + struct wlr_backend *backend = wlr_backend_create(&backend_impl, state); if (!backend) { wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); return NULL; } - backend->session = session; - - backend->outputs = list_create(); - if (!backend->outputs) { + state->backend = backend; + state->session = session; + state->outputs = list_create(); + if (!state->outputs) { wlr_log(L_ERROR, "Failed to allocate list"); goto error_backend; } - if (!wlr_udev_init(display, &backend->udev)) { + if (!wlr_udev_init(display, &state->udev)) { wlr_log(L_ERROR, "Failed to start udev"); goto error_list; } - backend->fd = wlr_udev_find_gpu(&backend->udev, backend->session); - if (backend->fd == -1) { + state->fd = wlr_udev_find_gpu(&state->udev, state->session); + if (state->fd == -1) { wlr_log(L_ERROR, "Failed to open DRM device"); goto error_udev; } struct wl_event_loop *event_loop = wl_display_get_event_loop(display); - backend->drm_event = wl_event_loop_add_fd(event_loop, backend->fd, + state->drm_event = wl_event_loop_add_fd(event_loop, state->fd, WL_EVENT_READABLE, wlr_drm_event, NULL); - if (!backend->drm_event) { + if (!state->drm_event) { wlr_log(L_ERROR, "Failed to create DRM event source"); goto error_fd; } - if (!wlr_drm_renderer_init(&backend->renderer, backend->fd)) { + if (!wlr_drm_renderer_init(&state->renderer, state->fd)) { wlr_log(L_ERROR, "Failed to initialize renderer"); goto error_event; } - wl_signal_init(&backend->signals.output_add); - wl_signal_init(&backend->signals.output_rem); - wl_signal_init(&backend->signals.output_render); - - if (add) { - wl_signal_add(&backend->signals.output_add, add); - } - if (rem) { - wl_signal_add(&backend->signals.output_rem, rem); - } - if (render) { - wl_signal_add(&backend->signals.output_render, render); - } - - wlr_drm_scan_connectors(backend); - return backend; error_event: - wl_event_source_remove(backend->drm_event); + wl_event_source_remove(state->drm_event); error_fd: - wlr_session_close_file(backend->session, backend->fd); + wlr_session_close_file(state->session, state->fd); error_udev: - wlr_udev_free(&backend->udev); + wlr_udev_free(&state->udev); error_list: - list_free(backend->outputs); + list_free(state->outputs); error_backend: + free(state); free(backend); return NULL; } - -static void free_output(void *item) -{ - struct wlr_drm_output *out = item; - wlr_drm_output_cleanup(out, true); - free(out); -} - -void wlr_drm_backend_free(struct wlr_drm_backend *backend) -{ - if (!backend) - return; - - list_foreach(backend->outputs, free_output); - - wlr_drm_renderer_free(&backend->renderer); - wlr_udev_free(&backend->udev); - wlr_session_close_file(backend->session, backend->fd); - wlr_session_finish(backend->session); - - wl_event_source_remove(backend->drm_event); - - list_free(backend->outputs); - free(backend); -} diff --git a/backend/drm/drm.c b/backend/drm/drm.c index b5e5739a8..abb3fb26e 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -13,6 +13,7 @@ #include #include +#include "backend.h" #include "backend/drm/backend.h" #include "backend/drm/drm.h" #include "common/log.h" @@ -167,10 +168,10 @@ static int find_id(const void *item, const void *cmp_to) { } } -void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { +void wlr_drm_scan_connectors(struct wlr_backend_state *state) { wlr_log(L_INFO, "Scanning DRM connectors"); - drmModeRes *res = drmModeGetResources(backend->fd); + drmModeRes *res = drmModeGetResources(state->fd); if (!res) { wlr_log(L_ERROR, "Failed to get DRM resources"); return; @@ -179,40 +180,40 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { for (int i = 0; i < res->count_connectors; ++i) { uint32_t id = res->connectors[i]; - drmModeConnector *conn = drmModeGetConnector(backend->fd, id); + drmModeConnector *conn = drmModeGetConnector(state->fd, id); if (!conn) { wlr_log(L_ERROR, "Failed to get DRM connector"); continue; } struct wlr_drm_output *out; - int index = list_seq_find(backend->outputs, find_id, &id); + int index = list_seq_find(state->outputs, find_id, &id); if (index == -1) { - out = calloc(1, sizeof *out); + out = calloc(1, sizeof(struct wlr_drm_output)); if (!out) { wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); drmModeFreeConnector(conn); continue; } - out->renderer = &backend->renderer; + out->renderer = &state->renderer; out->state = DRM_OUTPUT_DISCONNECTED; out->connector = id; snprintf(out->name, sizeof out->name, "%s-%"PRIu32, conn_name[conn->connector_type], conn->connector_type_id); - drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); + drmModeEncoder *curr_enc = drmModeGetEncoder(state->fd, conn->encoder_id); if (curr_enc) { - out->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); + out->old_crtc = drmModeGetCrtc(state->fd, curr_enc->crtc_id); free(curr_enc); } - list_add(backend->outputs, out); + list_add(state->outputs, out); wlr_log(L_INFO, "Found display '%s'", out->name); } else { - out = backend->outputs->items[index]; + out = state->outputs->items[index]; } if (out->state == DRM_OUTPUT_DISCONNECTED && @@ -244,8 +245,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) { out->state = DRM_OUTPUT_NEEDS_MODESET; wlr_log(L_INFO, "Sending modesetting signal for '%s'", out->name); - wl_signal_emit(&backend->signals.output_add, out); - + wl_signal_emit(&state->backend->events.output_add, out); } else if (out->state == DRM_OUTPUT_CONNECTED && conn->connection != DRM_MODE_CONNECTED) { @@ -270,12 +270,12 @@ struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t } bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode) { - struct wlr_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); + 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(backend->fd, out->connector); + drmModeConnector *conn = drmModeGetConnector(state->fd, out->connector); if (!conn) { wlr_log(L_ERROR, "Failed to get DRM connector"); goto error; @@ -286,7 +286,7 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mod goto error; } - drmModeRes *res = drmModeGetResources(backend->fd); + drmModeRes *res = drmModeGetResources(state->fd); if (!res) { wlr_log(L_ERROR, "Failed to get DRM resources"); goto error; @@ -294,7 +294,7 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mod bool success = false; for (int i = 0; !success && i < conn->count_encoders; ++i) { - drmModeEncoder *enc = drmModeGetEncoder(backend->fd, conn->encoders[i]); + drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]); if (!enc) continue; @@ -303,8 +303,8 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mod continue; } - if ((backend->taken_crtcs & (1 << j)) == 0) { - backend->taken_crtcs |= 1 << j; + if ((state->taken_crtcs & (1 << j)) == 0) { + state->taken_crtcs |= 1 << j; out->crtc = res->crtcs[j]; success = true; @@ -327,7 +327,7 @@ bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mod out->width = mode->width; out->height = mode->height; - if (!display_init_renderer(&backend->renderer, out)) { + if (!display_init_renderer(&state->renderer, out)) { wlr_log(L_ERROR, "Failed to initalise renderer for %s", out->name); goto error; } @@ -343,15 +343,14 @@ error: return false; } -static void page_flip_handler(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, - void *user) { - +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_drm_backend *backend = wl_container_of(out->renderer, backend, renderer); + struct wlr_backend_state *state = wl_container_of(out->renderer, state, renderer); out->pageflip_pending = false; if (out->state == DRM_OUTPUT_CONNECTED) { - wl_signal_emit(&backend->signals.output_render, out); + wl_signal_emit(&state->backend->events.output_frame, out); } } @@ -388,7 +387,7 @@ void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) { } struct wlr_drm_renderer *renderer = out->renderer; - struct wlr_drm_backend *backend = wl_container_of(renderer, backend, renderer); + struct wlr_backend_state *state = wl_container_of(renderer, state, renderer); switch (out->state) { case DRM_OUTPUT_CONNECTED: @@ -414,7 +413,7 @@ void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore) { } wlr_log(L_INFO, "Emmiting destruction signal for '%s'", out->name); - wl_signal_emit(&backend->signals.output_rem, out); + wl_signal_emit(&state->backend->events.output_remove, out); break; case DRM_OUTPUT_DISCONNECTED: diff --git a/backend/drm/udev.c b/backend/drm/udev.c index 438047d60..e5470157f 100644 --- a/backend/drm/udev.c +++ b/backend/drm/udev.c @@ -11,6 +11,7 @@ #include +#include "backend.h" #include "backend/drm/backend.h" #include "backend/drm/udev.h" #include "backend/drm/drm.h" @@ -139,7 +140,7 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session) { static int udev_event(int fd, uint32_t mask, void *data) { struct wlr_udev *udev = data; - struct wlr_drm_backend *backend = wl_container_of(udev, backend, udev); + struct wlr_backend_state *state = wl_container_of(udev, state, udev); struct udev_device *dev = udev_monitor_receive_device(udev->mon); if (!dev) { @@ -156,7 +157,7 @@ static int udev_event(int fd, uint32_t mask, void *data) { goto out; } - wlr_drm_scan_connectors(backend); + wlr_drm_scan_connectors(state); out: udev_device_unref(dev); diff --git a/example/example-drm.c b/example/example-drm.c index 1b1cce795..2e33e039f 100644 --- a/example/example-drm.c +++ b/example/example-drm.c @@ -14,13 +14,12 @@ struct state { struct timespec last_frame; - struct wl_listener add; - struct wl_listener rem; - struct wl_listener render; + struct wl_listener output_add; + struct wl_listener output_remove; + struct wl_listener output_frame; }; -void output_add(struct wl_listener *listener, void *data) -{ +void output_add(struct wl_listener *listener, void *data) { struct wlr_drm_output *out = data; fprintf(stderr, "Output '%s' added\n", wlr_drm_output_get_name(out)); @@ -30,16 +29,14 @@ void output_add(struct wl_listener *listener, void *data) wlr_drm_output_modeset(out, &modes[0]); } -void output_rem(struct wl_listener *listener, void *data) -{ +void output_remove(struct wl_listener *listener, void *data) { struct wlr_drm_output *out = data; fprintf(stderr, "Output '%s' removed\n", wlr_drm_output_get_name(out)); } -void output_render(struct wl_listener *listener, void *data) -{ +void output_frame(struct wl_listener *listener, void *data) { struct wlr_drm_output *out = data; - struct state *s = wl_container_of(listener, s, render); + struct state *s = wl_container_of(listener, s, output_frame); struct timespec now; clock_gettime(CLOCK_MONOTONIC, &now); @@ -68,14 +65,12 @@ void output_render(struct wl_listener *listener, void *data) wlr_drm_output_end(out); } -int timer_done(void *data) -{ +int timer_done(void *data) { *(bool *)data = true; return 1; } -int main() -{ +int main() { if (getenv("DISPLAY")) { fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); return 1; @@ -87,14 +82,14 @@ int main() struct state state = { .color = { 1.0, 0.0, 0.0 }, .dec = 0, - .add = { .notify = output_add }, - .rem = { .notify = output_rem }, - .render = { .notify = output_render }, + .output_add = { .notify = output_add }, + .output_remove = { .notify = output_remove }, + .output_frame = { .notify = output_frame }, }; - wl_list_init(&state.add.link); - wl_list_init(&state.rem.link); - wl_list_init(&state.render.link); + wl_list_init(&state.output_add.link); + wl_list_init(&state.output_remove.link); + wl_list_init(&state.output_frame.link); clock_gettime(CLOCK_MONOTONIC, &state.last_frame); struct wl_display *display = wl_display_create(); @@ -105,19 +100,25 @@ int main() return 1; } - struct wlr_drm_backend *wlr = wlr_drm_backend_init(display, session, - &state.add, &state.rem, &state.render); + struct wlr_backend *wlr = wlr_drm_backend_create(display, session); + wl_signal_add(&wlr->events.output_add, &state.output_add); + wl_signal_add(&wlr->events.output_remove, &state.output_remove); + wl_signal_add(&wlr->events.output_frame, &state.output_frame); + if (!wlr || !wlr_backend_init(wlr)) { + return 1; + } bool done = false; struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, timer_done, &done); - wl_event_source_timer_update(timer, 10000); + wl_event_source_timer_update(timer, 5000); - while (!done) + while (!done) { wl_event_loop_dispatch(event_loop, 0); + } wl_event_source_remove(timer); - wlr_drm_backend_free(wlr); + wlr_backend_destroy(wlr); wl_display_destroy(display); } diff --git a/include/backend.h b/include/backend.h new file mode 100644 index 000000000..d42c6f17c --- /dev/null +++ b/include/backend.h @@ -0,0 +1,17 @@ +#ifndef _WLR_BACKEND_INTERNAL_H +#define _WLR_BACKEND_INTERNAL_H + +#include +#include + +struct wlr_backend_state; + +struct wlr_backend_impl { + bool (*init)(struct wlr_backend_state *state); + void (*destroy)(struct wlr_backend_state *state); +}; + +struct wlr_backend *wlr_backend_create(const struct wlr_backend_impl *impl, + struct wlr_backend_state *state); + +#endif diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h index bdda7ea7c..0c725ccb8 100644 --- a/include/backend/drm/backend.h +++ b/include/backend/drm/backend.h @@ -12,21 +12,17 @@ #include #include +#include "backend.h" #include "udev.h" #include "event.h" #include "drm.h" -struct wlr_drm_backend { +struct wlr_backend_state { int fd; + struct wlr_backend *backend; struct wl_event_source *drm_event; - struct { - struct wl_signal output_add; - struct wl_signal output_rem; - struct wl_signal output_render; - } signals; - uint32_t taken_crtcs; list_t *outputs; diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 51b0cdc67..3e83058ac 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -8,6 +8,7 @@ #include #include "backend/egl.h" +#include "backend.h" struct wlr_drm_renderer { int fd; @@ -50,7 +51,7 @@ struct wlr_drm_output { void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore); -void wlr_drm_scan_connectors(struct wlr_drm_backend *backend); +void wlr_drm_scan_connectors(struct wlr_backend_state *state); int wlr_drm_event(int fd, uint32_t mask, void *data); #endif diff --git a/include/wlr/backend.h b/include/wlr/backend.h index 527efa052..88a5c8e93 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -1,7 +1,30 @@ #ifndef _WLR_BACKEND_H #define _WLR_BACKEND_H -struct wlr_backend *wlr_backend_init(); -void wlr_backend_free(struct wlr_backend *backend); +#include + +struct wlr_backend_impl; +struct wlr_backend_state; + +struct wlr_backend { + const struct wlr_backend_impl *impl; + struct wlr_backend_state *state; + + struct { + struct wl_signal output_add; + struct wl_signal output_remove; + struct wl_signal output_frame; + struct wl_signal keyboard_add; + struct wl_signal keyboard_remove; + struct wl_signal pointer_add; + struct wl_signal pointer_remove; + struct wl_signal touch_add; + struct wl_signal touch_remove; + } events; +}; + +struct wlr_backend *wlr_backend_autocreate(); +bool wlr_backend_init(struct wlr_backend *backend); +void wlr_backend_destroy(struct wlr_backend *backend); #endif diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 4131b4cb5..5db9b35c1 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -3,6 +3,7 @@ #include #include +#include #include // drmModeModeInfo struct wlr_drm_backend; @@ -15,10 +16,8 @@ struct wlr_drm_mode { drmModeModeInfo mode; }; -struct wlr_drm_backend *wlr_drm_backend_init(struct wl_display *display, - struct wlr_session *session, struct wl_listener *add, struct wl_listener *rem, - struct wl_listener *render); -void wlr_drm_backend_free(struct wlr_drm_backend *backend); +struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, + struct wlr_session *session); const char *wlr_drm_output_get_name(struct wlr_drm_output *out); From 00931f2f8fa4098c5e70b5ececd6d2dcb8786f90 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 7 May 2017 12:26:48 -0400 Subject: [PATCH 20/21] Generalize output handling --- backend/CMakeLists.txt | 8 +- backend/backend.c | 3 +- backend/drm/backend.c | 11 +- backend/drm/drm.c | 389 +++++++++++++++++----------------- example/CMakeLists.txt | 8 - example/example-drm.c | 124 ----------- example/main.c | 142 +++++++++++-- include/backend/drm/drm.h | 15 +- include/wayland.h | 18 ++ include/wlr/backend.h | 1 - include/wlr/backend/drm.h | 20 +- include/wlr/wayland.h | 43 ++-- wayland/CMakeLists.txt | 3 +- wayland/types/wlr_output.c | 31 +++ wayland/types/wlr_wl_output.c | 16 -- wayland/types/wlr_wl_seat.c | 19 -- 16 files changed, 407 insertions(+), 444 deletions(-) delete mode 100644 example/example-drm.c create mode 100644 include/wayland.h create mode 100644 wayland/types/wlr_output.c delete mode 100644 wayland/types/wlr_wl_output.c delete mode 100644 wayland/types/wlr_wl_seat.c diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 7183617ca..fc1793cfb 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 e40aaefec..753bb3aed 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 8c02669a3..0da84745b 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 abb3fb26e..5b186e41f 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -13,6 +13,7 @@ #include #include +#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) { - wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + output = calloc(1, sizeof(struct wlr_output_state)); + if (!state) { drmModeFreeConnector(conn); - continue; + 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); + 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); + _state->mode.hdisplay, _state->mode.vdisplay, + _state->mode.vrefresh); + + list_add(wlr_output->modes, mode); } - 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 && + 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) { - wlr_log(L_INFO, "'%s' disconnected", out->name); - wlr_drm_output_cleanup(out, false); + wlr_log(L_INFO, "'%s' disconnected", output->name); + // TODO: Destroy + wlr_drm_output_cleanup(output, 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; - - 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; - out->crtc = res->crtcs[j]; - - success = true; - break; - } - } - - drmModeFreeEncoder(enc); - } - - 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 } diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 29a776756..f619b97f7 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -8,13 +8,5 @@ add_executable(example target_link_libraries(example wlr-backend -) - -add_executable(example-drm - example-drm.c -) - -target_link_libraries(example-drm - wlr-backend wlr-session ) diff --git a/example/example-drm.c b/example/example-drm.c deleted file mode 100644 index 2e33e039f..000000000 --- a/example/example-drm.c +++ /dev/null @@ -1,124 +0,0 @@ -#define _POSIX_C_SOURCE 199309L -#include -#include -#include -#include -#include - -#include -#include - -struct state { - float color[3]; - int dec; - - struct timespec last_frame; - - struct wl_listener output_add; - struct wl_listener output_remove; - struct wl_listener output_frame; -}; - -void output_add(struct wl_listener *listener, void *data) { - struct wlr_drm_output *out = data; - fprintf(stderr, "Output '%s' added\n", wlr_drm_output_get_name(out)); - - size_t num_modes; - struct wlr_drm_mode *modes = wlr_drm_output_get_modes(out, &num_modes); - - wlr_drm_output_modeset(out, &modes[0]); -} - -void output_remove(struct wl_listener *listener, void *data) { - struct wlr_drm_output *out = data; - fprintf(stderr, "Output '%s' removed\n", wlr_drm_output_get_name(out)); -} - -void output_frame(struct wl_listener *listener, void *data) { - struct wlr_drm_output *out = data; - struct state *s = wl_container_of(listener, s, output_frame); - - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); - - long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 + - (now.tv_nsec - s->last_frame.tv_nsec) / 1000000; - int inc = (s->dec + 1) % 3; - - s->color[inc] += ms / 2000.0f; - s->color[s->dec] -= ms / 2000.0f; - - if (s->color[s->dec] < 0.0f) { - s->color[inc] = 1.0f; - s->color[s->dec] = 0.0f; - - s->dec = inc; - } - - s->last_frame = now; - - wlr_drm_output_begin(out); - - glClearColor(s->color[0], s->color[1], s->color[2], 1.0); - glClear(GL_COLOR_BUFFER_BIT); - - wlr_drm_output_end(out); -} - -int timer_done(void *data) { - *(bool *)data = true; - return 1; -} - -int main() { - if (getenv("DISPLAY")) { - fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); - return 1; - } else if (getenv("WAYLAND_DISPLAY")) { - fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n"); - return 1; - } - - struct state state = { - .color = { 1.0, 0.0, 0.0 }, - .dec = 0, - .output_add = { .notify = output_add }, - .output_remove = { .notify = output_remove }, - .output_frame = { .notify = output_frame }, - }; - - wl_list_init(&state.output_add.link); - wl_list_init(&state.output_remove.link); - wl_list_init(&state.output_frame.link); - clock_gettime(CLOCK_MONOTONIC, &state.last_frame); - - struct wl_display *display = wl_display_create(); - struct wl_event_loop *event_loop = wl_display_get_event_loop(display); - - struct wlr_session *session = wlr_session_start(); - if (!session) { - return 1; - } - - struct wlr_backend *wlr = wlr_drm_backend_create(display, session); - wl_signal_add(&wlr->events.output_add, &state.output_add); - wl_signal_add(&wlr->events.output_remove, &state.output_remove); - wl_signal_add(&wlr->events.output_frame, &state.output_frame); - if (!wlr || !wlr_backend_init(wlr)) { - return 1; - } - - bool done = false; - struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, - timer_done, &done); - - wl_event_source_timer_update(timer, 5000); - - while (!done) { - wl_event_loop_dispatch(event_loop, 0); - } - - wl_event_source_remove(timer); - wlr_backend_destroy(wlr); - wl_display_destroy(display); -} diff --git a/example/main.c b/example/main.c index 4240b9e37..2c168d98b 100644 --- a/example/main.c +++ b/example/main.c @@ -1,19 +1,133 @@ -#define _POSIX_C_SOURCE 200112L +#define _POSIX_C_SOURCE 199309L +#include #include -#include -#include +#include #include +#include +#include +#include +#include -int main(int argc, char **argv) { - // TODO: Move this stuff to a wlr backend selector function - char *_wl_display = getenv("WAYLAND_DISPLAY"); - if (_wl_display) { - unsetenv("WAYLAND_DISPLAY"); - setenv("_WAYLAND_DISPLAY", _wl_display, 1); +struct state { + float color[3]; + int dec; + struct timespec last_frame; + struct wl_listener output_add; + struct wl_listener output_remove; + list_t *outputs; +}; + +struct output_state { + struct wlr_output *output; + struct state *state; + struct wl_listener frame; +}; + +void output_frame(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + struct output_state *ostate = wl_container_of( + listener, ostate, frame); + struct state *s = ostate->state; + + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + + long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 + + (now.tv_nsec - s->last_frame.tv_nsec) / 1000000; + int inc = (s->dec + 1) % 3; + + s->color[inc] += ms / 2000.0f; + s->color[s->dec] -= ms / 2000.0f; + + if (s->color[s->dec] < 0.0f) { + s->color[inc] = 1.0f; + s->color[s->dec] = 0.0f; + + s->dec = inc; } - struct wl_display *wl_display = wl_display_create(); - struct wlr_wl_backend *backend = wlr_wl_backend_init(wl_display, 1); - wlr_wl_backend_free(backend); - wl_display_destroy(wl_display); - return 0; + + s->last_frame = now; + + wlr_drm_output_begin(output); + + glClearColor(s->color[0], s->color[1], s->color[2], 1.0); + glClear(GL_COLOR_BUFFER_BIT); + + wlr_drm_output_end(output); +} + +void output_add(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + struct state *state = wl_container_of(listener, state, output_add); + fprintf(stderr, "Output '%s' added\n", output->name); + wlr_output_set_mode(output, output->modes->items[0]); + struct output_state *ostate = calloc(1, sizeof(struct output_state)); + ostate->output = output; + ostate->state = state; + ostate->frame.notify = output_frame; + wl_list_init(&ostate->frame.link); + wl_signal_add(&output->events.frame, &ostate->frame); + list_add(state->outputs, ostate); +} + +void output_remove(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + fprintf(stderr, "Output '%s' removed\n", output->name); + // TODO: remove signal from state->output_frame +} + +int timer_done(void *data) { + *(bool *)data = true; + return 1; +} + +int main() { + if (getenv("DISPLAY")) { + fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); + return 1; + } else if (getenv("WAYLAND_DISPLAY")) { + fprintf(stderr, "Detected that Wayland is running. Run this in its own virtual terminal.\n"); + return 1; + } + + struct state state = { + .color = { 1.0, 0.0, 0.0 }, + .dec = 0, + .output_add = { .notify = output_add }, + .output_remove = { .notify = output_remove }, + .outputs = list_create(), + }; + + wl_list_init(&state.output_add.link); + wl_list_init(&state.output_remove.link); + clock_gettime(CLOCK_MONOTONIC, &state.last_frame); + + struct wl_display *display = wl_display_create(); + struct wl_event_loop *event_loop = wl_display_get_event_loop(display); + + struct wlr_session *session = wlr_session_start(); + if (!session) { + return 1; + } + + struct wlr_backend *wlr = wlr_drm_backend_create(display, session); + wl_signal_add(&wlr->events.output_add, &state.output_add); + wl_signal_add(&wlr->events.output_remove, &state.output_remove); + if (!wlr || !wlr_backend_init(wlr)) { + return 1; + } + + bool done = false; + struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, + timer_done, &done); + + wl_event_source_timer_update(timer, 5000); + + while (!done) { + wl_event_loop_dispatch(event_loop, 0); + } + + wl_event_source_remove(timer); + wlr_backend_destroy(wlr); + wl_display_destroy(display); } diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 3e83058ac..4b42aa68d 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -12,7 +12,6 @@ struct wlr_drm_renderer { int fd; - struct gbm_device *gbm; struct wlr_egl egl; }; @@ -26,15 +25,17 @@ enum wlr_drm_output_state { DRM_OUTPUT_CONNECTED, }; -struct wlr_drm_output { +struct wlr_output_mode_state { + struct wlr_wl_output_mode *wlr_mode; + drmModeModeInfo mode; +}; + +struct wlr_output_state { + struct wlr_output *wlr_output; enum wlr_drm_output_state state; uint32_t connector; char name[16]; - size_t num_modes; - struct wlr_drm_mode *modes; - struct wlr_drm_mode *active_mode; - uint32_t width; uint32_t height; @@ -49,7 +50,7 @@ struct wlr_drm_output { bool cleanup; }; -void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore); +void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore); void wlr_drm_scan_connectors(struct wlr_backend_state *state); int wlr_drm_event(int fd, uint32_t mask, void *data); diff --git a/include/wayland.h b/include/wayland.h new file mode 100644 index 000000000..688179364 --- /dev/null +++ b/include/wayland.h @@ -0,0 +1,18 @@ +#ifndef _WLR_WAYLAND_INTERNAL_H +#define _WLR_WAYLAND_INTERNAL_H + +#include +#include +#include + +struct wlr_output_impl { + bool (*set_mode)(struct wlr_output_state *state, struct wlr_output_mode *mode); + void (*destroy)(struct wlr_output_state *state); +}; + +struct wlr_output *wlr_output_create(struct wlr_output_impl *impl, + struct wlr_output_state *state); + +void wlr_output_free(struct wlr_output *output); + +#endif diff --git a/include/wlr/backend.h b/include/wlr/backend.h index 88a5c8e93..b424c29f2 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -13,7 +13,6 @@ struct wlr_backend { struct { struct wl_signal output_add; struct wl_signal output_remove; - struct wl_signal output_frame; struct wl_signal keyboard_add; struct wl_signal keyboard_remove; struct wl_signal pointer_add; diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 5db9b35c1..2d9bf879a 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -5,26 +5,12 @@ #include #include #include // drmModeModeInfo - -struct wlr_drm_backend; -struct wlr_drm_output; - -struct wlr_drm_mode { - uint16_t width; - uint16_t height; - uint32_t rate; - drmModeModeInfo mode; -}; +#include struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, struct wlr_session *session); -const char *wlr_drm_output_get_name(struct wlr_drm_output *out); - -struct wlr_drm_mode *wlr_drm_output_get_modes(struct wlr_drm_output *out, size_t *count); -bool wlr_drm_output_modeset(struct wlr_drm_output *out, struct wlr_drm_mode *mode); - -void wlr_drm_output_begin(struct wlr_drm_output *out); -void wlr_drm_output_end(struct wlr_drm_output *out); +void wlr_drm_output_begin(struct wlr_output *out); +void wlr_drm_output_end(struct wlr_output *out); #endif diff --git a/include/wlr/wayland.h b/include/wlr/wayland.h index bbbd2457e..158acc33d 100644 --- a/include/wlr/wayland.h +++ b/include/wlr/wayland.h @@ -3,26 +3,26 @@ #include #include +#include -struct wlr_wl_seat { - struct wl_seat *wl_seat; - uint32_t capabilities; - char *name; - list_t *keyboards; - list_t *pointers; -}; +struct wlr_output_mode_state; -void wlr_wl_seat_free(struct wlr_wl_seat *seat); - -struct wlr_wl_output_mode { +struct wlr_output_mode { + struct wlr_output_mode_state *state; uint32_t flags; // enum wl_output_mode int32_t width, height; int32_t refresh; // mHz }; -struct wlr_wl_output { - struct wl_output *wl_output; +struct wlr_output_impl; +struct wlr_output_state; + +struct wlr_output { + const struct wlr_output_impl *impl; + struct wlr_output_state *state; + uint32_t flags; + char *name; char *make; char *model; uint32_t scale; @@ -30,20 +30,15 @@ struct wlr_wl_output { int32_t phys_width, phys_height; // mm int32_t subpixel; // enum wl_output_subpixel int32_t transform; // enum wl_output_transform + list_t *modes; - struct wlr_wl_output_mode *current_mode; + struct wlr_output_mode *current_mode; + + struct { + struct wl_signal frame; + } events; }; -void wlr_wl_output_free(struct wlr_wl_output *output); - -struct wlr_wl_keyboard { - struct wl_keyboard *wl_keyboard; -}; - -struct wlr_wl_pointer { - struct wl_pointer *wl_pointer; - struct wl_surface *current_surface; - wl_fixed_t x, y; -}; +bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); #endif diff --git a/wayland/CMakeLists.txt b/wayland/CMakeLists.txt index be4a00de7..675a7bd29 100644 --- a/wayland/CMakeLists.txt +++ b/wayland/CMakeLists.txt @@ -4,8 +4,7 @@ include_directories( ) add_library(wlr-wayland - types/wlr_wl_seat.c - types/wlr_wl_output.c + types/wlr_output.c ) target_link_libraries(wlr-wayland diff --git a/wayland/types/wlr_output.c b/wayland/types/wlr_output.c new file mode 100644 index 000000000..bc093c004 --- /dev/null +++ b/wayland/types/wlr_output.c @@ -0,0 +1,31 @@ +#include +#include +#include "wlr/wayland.h" +#include "wlr/common/list.h" +#include "wayland.h" + +struct wlr_output *wlr_output_create(struct wlr_output_impl *impl, + struct wlr_output_state *state) { + struct wlr_output *output = calloc(1, sizeof(struct wlr_output)); + output->impl = impl; + output->state = state; + output->modes = list_create(); + wl_signal_init(&output->events.frame); + return output; +} + +void wlr_output_free(struct wlr_output *output) { + if (!output) return; + if (output->make) free(output->make); + if (output->model) free(output->model); + for (size_t i = 0; output->modes && i < output->modes->length; ++i) { + free(output->modes->items[i]); + } + list_free(output->modes); + output->impl->destroy(output->state); + free(output); +} + +bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode) { + return output->impl->set_mode(output->state, mode); +} diff --git a/wayland/types/wlr_wl_output.c b/wayland/types/wlr_wl_output.c deleted file mode 100644 index 32aaf0709..000000000 --- a/wayland/types/wlr_wl_output.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include -#include "wlr/wayland.h" -#include "wlr/common/list.h" - -void wlr_wl_output_free(struct wlr_wl_output *output) { - if (!output) return; - if (output->wl_output) wl_output_destroy(output->wl_output); - if (output->make) free(output->make); - if (output->model) free(output->model); - for (size_t i = 0; output->modes && i < output->modes->length; ++i) { - free(output->modes->items[i]); - } - list_free(output->modes); - free(output); -} diff --git a/wayland/types/wlr_wl_seat.c b/wayland/types/wlr_wl_seat.c deleted file mode 100644 index a5ef38539..000000000 --- a/wayland/types/wlr_wl_seat.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include -#include "wlr/wayland.h" -#include "wlr/common/list.h" - -void wlr_wl_seat_free(struct wlr_wl_seat *seat) { - if (!seat) return; - if (seat->wl_seat) wl_seat_destroy(seat->wl_seat); - if (seat->name) free(seat->name); - if (seat->keyboards) { - // TODO: free children - list_free(seat->keyboards); - } - if (seat->pointers) { - // TODO: free children - list_free(seat->keyboards); - } - free(seat); -} From 42878b45a1dba582feb5ec75762d66ede51fdc98 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 10 May 2017 10:36:37 -0400 Subject: [PATCH 21/21] Remove unnecessary TODO --- backend/drm/drm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 5b186e41f..7cbd3e4ad 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -233,7 +233,6 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output, return true; error: - // TODO: destroy wlr_drm_output_cleanup(output, false); drmModeFreeConnector(conn); return false;