aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/drm/backend.c6
-rw-r--r--backend/drm/drm.c164
-rw-r--r--backend/drm/drm.h2
-rw-r--r--examples/shared.c2
4 files changed, 62 insertions, 112 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index ea14d41c..dde34003 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -32,6 +32,7 @@ static void wlr_drm_backend_destroy(struct wlr_backend_state *drm) {
wlr_udev_signal_remove(drm->udev, &drm->drm_invalidated);
wlr_drm_renderer_free(&drm->renderer);
+ wlr_drm_resources_free(drm);
wlr_session_close_file(drm->session, drm->fd);
wl_event_source_remove(drm->drm_event);
free(drm);
@@ -55,11 +56,6 @@ static void session_signal(struct wl_listener *listener, void *data) {
}
} else {
wlr_log(L_INFO, "DRM fd paused");
-
- for (size_t i = 0; i < drm->outputs->length; ++i) {
- struct wlr_output_state *output = drm->outputs->items[i];
- wlr_drm_output_pause_renderer(output);
- }
}
}
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index d2a4f06b..8d52504e 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -54,19 +54,15 @@ static bool init_planes(struct wlr_backend_state *drm)
return true;
}
- size_t num_planes = plane_res->count_planes;
- struct wlr_drm_plane *planes = calloc(num_planes, sizeof(*planes));
- if (!planes) {
+ drm->num_planes = plane_res->count_planes;
+ drm->planes = calloc(drm->num_planes, sizeof(*drm->planes));
+ if (!drm->planes) {
wlr_log_errno(L_ERROR, "Allocation failed");
goto error_res;
}
- size_t num_overlay = 0;
- size_t num_primary = 0;
- size_t num_cursor = 0;
-
- for (size_t i = 0; i < num_planes; ++i) {
- struct wlr_drm_plane *p = &planes[i];
+ for (size_t i = 0; i < drm->num_planes; ++i) {
+ struct wlr_drm_plane *p = &drm->planes[i];
drmModePlane *plane = drmModeGetPlane(drm->fd, plane_res->planes[i]);
if (!plane) {
@@ -85,41 +81,24 @@ static bool init_planes(struct wlr_backend_state *drm)
}
p->type = type;
-
- switch (type) {
- case DRM_PLANE_TYPE_OVERLAY:
- ++num_overlay;
- break;
- case DRM_PLANE_TYPE_PRIMARY:
- ++num_primary;
- break;
- case DRM_PLANE_TYPE_CURSOR:
- ++num_cursor;
- break;
- }
+ drm->num_type_planes[type]++;
drmModeFreePlane(plane);
}
wlr_log(L_INFO, "(%zu overlay, %zu primary, %zu cursor)",
- num_overlay, num_primary, num_cursor);
-
- qsort(planes, num_planes, sizeof(*planes), cmp_plane);
+ drm->num_overlay_planes, drm->num_primary_planes, drm->num_cursor_planes);
- drm->num_planes = num_planes;
- drm->num_overlay_planes = num_overlay;
- drm->num_primary_planes = num_primary;
- drm->num_cursor_planes = num_cursor;
+ qsort(drm->planes, drm->num_planes, sizeof(*drm->planes), cmp_plane);
- drm->planes = planes;
- drm->overlay_planes = planes;
- drm->primary_planes = planes + num_overlay;
- drm->cursor_planes = planes + num_overlay + num_primary;
+ drm->overlay_planes = drm->planes;
+ drm->primary_planes = drm->overlay_planes + drm->num_overlay_planes;
+ drm->cursor_planes = drm->primary_planes + drm->num_primary_planes;
return true;
error_planes:
- free(planes);
+ free(drm->planes);
error_res:
drmModeFreePlaneResources(plane_res);
return false;
@@ -162,6 +141,14 @@ error_res:
return false;
}
+void wlr_drm_resources_free(struct wlr_backend_state *drm) {
+ if (!drm)
+ return;
+
+ free(drm->crtcs);
+ free(drm->planes);
+}
+
bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
renderer->gbm = gbm_create_device(fd);
if (!renderer->gbm) {
@@ -179,54 +166,55 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
}
void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) {
- if (!renderer) {
+ if (!renderer)
return;
- }
+
wlr_egl_free(&renderer->egl);
gbm_device_destroy(renderer->gbm);
}
static void free_fb(struct gbm_bo *bo, void *data) {
- uint32_t *id = data;
+ uint32_t id = (uintptr_t)data;
- if (id && *id) {
+ if (id) {
struct gbm_device *gbm = gbm_bo_get_device(bo);
- drmModeRmFB(gbm_device_get_fd(gbm), *id);
+ drmModeRmFB(gbm_device_get_fd(gbm), id);
}
-
- free(id);
}
static uint32_t get_fb_for_bo(struct gbm_bo *bo) {
- uint32_t *id = gbm_bo_get_user_data(bo);
+ uint32_t id = (uintptr_t)gbm_bo_get_user_data(bo);
+ if (id)
+ return id;
- if (id) {
- return *id;
- }
+ struct gbm_device *gbm = gbm_bo_get_device(bo);
+ drmModeAddFB(gbm_device_get_fd(gbm), gbm_bo_get_width(bo), gbm_bo_get_height(bo),
+ 24, 32, gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, &id);
- id = calloc(1, sizeof *id);
- if (!id) {
- wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
- return 0;
- }
+ gbm_bo_set_user_data(bo, (void *)(uintptr_t)id, free_fb);
- struct gbm_device *gbm = gbm_bo_get_device(bo);
- int fd = gbm_device_get_fd(gbm);
+ return id;
+}
+
+static void wlr_drm_plane_make_current(struct wlr_drm_renderer *renderer,
+ struct wlr_drm_plane *plane) {
+ eglMakeCurrent(renderer->egl.display, plane->egl, plane->egl,
+ renderer->egl.context);
+}
- 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);
+static void wlr_drm_plane_swap_buffers(struct wlr_drm_renderer *renderer,
+ struct wlr_drm_plane *plane) {
+ if (plane->front)
+ gbm_surface_release_buffer(plane->gbm, plane->front);
- gbm_bo_set_user_data(bo, id, free_fb);
+ eglSwapBuffers(renderer->egl.display, plane->egl);
- return *id;
+ plane->front = plane->back;
+ plane->back = gbm_surface_lock_front_buffer(plane->gbm);
}
static void wlr_drm_output_make_current(struct wlr_output_state *output) {
- struct wlr_drm_renderer *renderer = output->renderer;
- struct wlr_drm_plane *plane = output->crtc->primary;
-
- eglMakeCurrent(renderer->egl.display, plane->egl,
- plane->egl, renderer->egl.context);
+ wlr_drm_plane_make_current(output->renderer, output->crtc->primary);
}
static void wlr_drm_output_swap_buffers(struct wlr_output_state *output) {
@@ -234,39 +222,11 @@ static void wlr_drm_output_swap_buffers(struct wlr_output_state *output) {
struct wlr_drm_crtc *crtc = output->crtc;
struct wlr_drm_plane *plane = crtc->primary;
- if (!eglSwapBuffers(renderer->egl.display, plane->egl)) {
- return;
- }
-
- struct gbm_bo *bo = gbm_surface_lock_front_buffer(plane->gbm);
- if (!bo) {
- return;
- }
+ wlr_drm_plane_swap_buffers(renderer, plane);
+ uint32_t fb_id = get_fb_for_bo(plane->back);
- uint32_t fb_id = get_fb_for_bo(bo);
drmModePageFlip(renderer->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
output->pageflip_pending = true;
-
- plane->front = plane->back;
- plane->back = bo;
-}
-
-void wlr_drm_output_pause_renderer(struct wlr_output_state *output) {
- if (output->state != WLR_DRM_OUTPUT_CONNECTED) {
- return;
- }
-
- struct wlr_drm_plane *plane = output->crtc->primary;
-
- if (plane->front) {
- gbm_surface_release_buffer(plane->gbm, plane->front);
- plane->front = NULL;
- }
- if (plane->back) {
- gbm_surface_release_buffer(plane->gbm, plane->back);
- plane->back = NULL;
- }
-
}
void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
@@ -279,19 +239,16 @@ void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
struct wlr_drm_crtc *crtc = output->crtc;
struct wlr_drm_plane *plane = crtc->primary;
- eglMakeCurrent(renderer->egl.display, plane->egl, plane->egl, renderer->egl.context);
-
- glViewport(0, 0, output->width, output->height);
- glClearColor(0.0, 0.0, 0.0, 1.0);
- glClear(GL_COLOR_BUFFER_BIT);
-
- if (!eglSwapBuffers(renderer->egl.display, plane->egl)) {
- return;
- }
-
- struct gbm_bo *bo = gbm_surface_lock_front_buffer(plane->gbm);
+ struct gbm_bo *bo = plane->front;
if (!bo) {
- return;
+ // Render a black frame to start the rendering loop
+ wlr_drm_plane_make_current(renderer, plane);
+ glViewport(0, 0, plane->width, plane->height);
+ glClearColor(0.0, 0.0, 0.0, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+ wlr_drm_plane_swap_buffers(renderer, plane);
+
+ bo = plane->back;
}
uint32_t fb_id = get_fb_for_bo(bo);
@@ -299,9 +256,6 @@ void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
&output->connector, 1, &mode->state->mode);
drmModePageFlip(renderer->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
output->pageflip_pending = true;
-
- plane->back = plane->front;
- plane->front = bo;
}
static bool plane_init_renderer(struct wlr_drm_renderer *renderer,
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index ed431680..ec068cd0 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -153,12 +153,12 @@ struct wlr_output_state {
bool wlr_drm_check_features(struct wlr_backend_state *drm);
bool wlr_drm_resources_init(struct wlr_backend_state *drm);
+void wlr_drm_resources_free(struct wlr_backend_state *drm);
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);
void wlr_drm_output_start_renderer(struct wlr_output_state *output);
-void wlr_drm_output_pause_renderer(struct wlr_output_state *output);
#endif
diff --git a/examples/shared.c b/examples/shared.c
index c66b8a23..cebdb785 100644
--- a/examples/shared.c
+++ b/examples/shared.c
@@ -9,7 +9,7 @@
#include <wayland-server-protocol.h>
#include <wlr/backend.h>
#include <wlr/backend/session.h>
-#include <wlr/backend/multi.h>
+#include <wlr/backend/multi.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/util/log.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-07 04:22:17 +0000