mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-10-31 22:25:21 -04:00
Rename backend to drm
This commit is contained in:
Scott Anderson
parent
ec5b95e08f
commit
22e77d9195
5 changed files with 210 additions and 215 deletions
|
|
@ -14,36 +14,37 @@
|
|||
#include <wlr/egl.h>
|
||||
#include "backend/drm/drm.h"
|
||||
|
||||
static bool wlr_drm_backend_start(struct wlr_backend *_backend) {
|
||||
struct wlr_drm_backend *backend = (struct wlr_drm_backend *)_backend;
|
||||
wlr_drm_scan_connectors(backend);
|
||||
static bool wlr_drm_backend_start(struct wlr_backend *backend) {
|
||||
struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend;
|
||||
wlr_drm_scan_connectors(drm);
|
||||
return true;
|
||||
}
|
||||
|
||||
static void wlr_drm_backend_destroy(struct wlr_backend *_backend) {
|
||||
if (!_backend) {
|
||||
static void wlr_drm_backend_destroy(struct wlr_backend *backend) {
|
||||
if (!backend) {
|
||||
return;
|
||||
}
|
||||
struct wlr_drm_backend *backend = (struct wlr_drm_backend *)_backend;
|
||||
|
||||
wlr_drm_restore_outputs(backend);
|
||||
struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend;
|
||||
|
||||
for (size_t i = 0; backend->outputs && i < backend->outputs->length; ++i) {
|
||||
struct wlr_drm_output *output = backend->outputs->items[i];
|
||||
wlr_drm_restore_outputs(drm);
|
||||
|
||||
for (size_t i = 0; drm->outputs && i < drm->outputs->length; ++i) {
|
||||
struct wlr_drm_output *output = drm->outputs->items[i];
|
||||
wlr_output_destroy(&output->output);
|
||||
}
|
||||
|
||||
wlr_drm_renderer_finish(&backend->renderer);
|
||||
wlr_drm_resources_free(backend);
|
||||
wlr_session_close_file(backend->session, backend->fd);
|
||||
wl_event_source_remove(backend->drm_event);
|
||||
list_free(backend->outputs);
|
||||
free(backend);
|
||||
wlr_drm_renderer_finish(&drm->renderer);
|
||||
wlr_drm_resources_free(drm);
|
||||
wlr_session_close_file(drm->session, drm->fd);
|
||||
wl_event_source_remove(drm->drm_event);
|
||||
list_free(drm->outputs);
|
||||
free(drm);
|
||||
}
|
||||
|
||||
static struct wlr_egl *wlr_drm_backend_get_egl(struct wlr_backend *_backend) {
|
||||
struct wlr_drm_backend *backend = (struct wlr_drm_backend *)_backend;
|
||||
return &backend->renderer.egl;
|
||||
struct wlr_drm_backend *drm = (struct wlr_drm_backend *)_backend;
|
||||
return &drm->renderer.egl;
|
||||
}
|
||||
|
||||
static struct wlr_backend_impl backend_impl = {
|
||||
|
|
@ -57,15 +58,14 @@ bool wlr_backend_is_drm(struct wlr_backend *b) {
|
|||
}
|
||||
|
||||
static void session_signal(struct wl_listener *listener, void *data) {
|
||||
struct wlr_drm_backend *backend =
|
||||
wl_container_of(listener, backend, session_signal);
|
||||
struct wlr_drm_backend *drm = wl_container_of(listener, drm, session_signal);
|
||||
struct wlr_session *session = data;
|
||||
|
||||
if (session->active) {
|
||||
wlr_log(L_INFO, "DRM fd resumed");
|
||||
|
||||
for (size_t i = 0; i < backend->outputs->length; ++i) {
|
||||
struct wlr_drm_output *output = backend->outputs->items[i];
|
||||
for (size_t i = 0; i < drm->outputs->length; ++i) {
|
||||
struct wlr_drm_output *output = drm->outputs->items[i];
|
||||
wlr_drm_output_start_renderer(output);
|
||||
|
||||
if (!output->crtc) {
|
||||
|
|
@ -73,7 +73,7 @@ static void session_signal(struct wl_listener *listener, void *data) {
|
|||
}
|
||||
|
||||
struct wlr_drm_plane *plane = output->crtc->cursor;
|
||||
backend->iface->crtc_set_cursor(backend, output->crtc,
|
||||
drm->iface->crtc_set_cursor(drm, output->crtc,
|
||||
plane ? plane->cursor_bo : NULL);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -82,14 +82,13 @@ static void session_signal(struct wl_listener *listener, void *data) {
|
|||
}
|
||||
|
||||
static void drm_invalidated(struct wl_listener *listener, void *data) {
|
||||
struct wlr_drm_backend *backend =
|
||||
wl_container_of(listener, backend, drm_invalidated);
|
||||
struct wlr_drm_backend *drm = wl_container_of(listener, drm, drm_invalidated);
|
||||
|
||||
char *name = drmGetDeviceNameFromFd2(backend->fd);
|
||||
char *name = drmGetDeviceNameFromFd2(drm->fd);
|
||||
wlr_log(L_DEBUG, "%s invalidated", name);
|
||||
free(name);
|
||||
|
||||
wlr_drm_scan_connectors(backend);
|
||||
wlr_drm_scan_connectors(drm);
|
||||
}
|
||||
|
||||
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
|
||||
|
|
@ -102,63 +101,63 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
|
|||
free(name);
|
||||
drmFreeVersion(version);
|
||||
|
||||
struct wlr_drm_backend *backend = calloc(1, sizeof(struct wlr_drm_backend));
|
||||
if (!backend) {
|
||||
struct wlr_drm_backend *drm = calloc(1, sizeof(struct wlr_drm_backend));
|
||||
if (!drm) {
|
||||
wlr_log_errno(L_ERROR, "Allocation failed");
|
||||
return NULL;
|
||||
}
|
||||
wlr_backend_init(&backend->backend, &backend_impl);
|
||||
wlr_backend_init(&drm->backend, &backend_impl);
|
||||
|
||||
backend->session = session;
|
||||
backend->outputs = list_create();
|
||||
if (!backend->outputs) {
|
||||
drm->session = session;
|
||||
drm->outputs = list_create();
|
||||
if (!drm->outputs) {
|
||||
wlr_log(L_ERROR, "Failed to allocate list");
|
||||
goto error_backend;
|
||||
}
|
||||
|
||||
backend->fd = gpu_fd;
|
||||
drm->fd = gpu_fd;
|
||||
|
||||
backend->drm_invalidated.notify = drm_invalidated;
|
||||
wlr_session_signal_add(session, gpu_fd, &backend->drm_invalidated);
|
||||
drm->drm_invalidated.notify = drm_invalidated;
|
||||
wlr_session_signal_add(session, gpu_fd, &drm->drm_invalidated);
|
||||
|
||||
backend->display = display;
|
||||
drm->display = display;
|
||||
struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
|
||||
|
||||
backend->drm_event = wl_event_loop_add_fd(event_loop, backend->fd,
|
||||
drm->drm_event = wl_event_loop_add_fd(event_loop, drm->fd,
|
||||
WL_EVENT_READABLE, wlr_drm_event, NULL);
|
||||
if (!backend->drm_event) {
|
||||
if (!drm->drm_event) {
|
||||
wlr_log(L_ERROR, "Failed to create DRM event source");
|
||||
goto error_fd;
|
||||
}
|
||||
|
||||
backend->session_signal.notify = session_signal;
|
||||
wl_signal_add(&session->session_signal, &backend->session_signal);
|
||||
drm->session_signal.notify = session_signal;
|
||||
wl_signal_add(&session->session_signal, &drm->session_signal);
|
||||
|
||||
if (!wlr_drm_check_features(backend)) {
|
||||
if (!wlr_drm_check_features(drm)) {
|
||||
goto error_event;
|
||||
}
|
||||
|
||||
if (!wlr_drm_resources_init(backend)) {
|
||||
if (!wlr_drm_resources_init(drm)) {
|
||||
goto error_event;
|
||||
}
|
||||
|
||||
if (!wlr_drm_renderer_init(&backend->renderer, backend->fd)) {
|
||||
if (!wlr_drm_renderer_init(&drm->renderer, drm->fd)) {
|
||||
wlr_log(L_ERROR, "Failed to initialize renderer");
|
||||
goto error_event;
|
||||
}
|
||||
|
||||
if (!wlr_egl_bind_display(&backend->renderer.egl, display)) {
|
||||
if (!wlr_egl_bind_display(&drm->renderer.egl, display)) {
|
||||
wlr_log(L_INFO, "Failed to bind egl/wl display: %s", egl_error());
|
||||
}
|
||||
|
||||
return &backend->backend;
|
||||
return &drm->backend;
|
||||
|
||||
error_event:
|
||||
wl_event_source_remove(backend->drm_event);
|
||||
wl_event_source_remove(drm->drm_event);
|
||||
error_fd:
|
||||
wlr_session_close_file(backend->session, backend->fd);
|
||||
list_free(backend->outputs);
|
||||
wlr_session_close_file(drm->session, drm->fd);
|
||||
list_free(drm->outputs);
|
||||
error_backend:
|
||||
free(backend);
|
||||
free(drm);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue