Merge branch 'conn-port' into 'master'

Draft: output: add wlr_output.port

See merge request wlroots/wlroots!3979
This commit is contained in:
Simon Ser 2025-10-26 08:32:08 +00:00
commit 7dc492bde9
7 changed files with 143 additions and 1 deletions

View file

@ -11,6 +11,7 @@
#include <xf86drm.h>
#include "backend/drm/drm.h"
#include "backend/drm/fb.h"
#include "backend/drm/util.h"
#include "render/drm_format_set.h"
struct wlr_drm_backend *get_drm_backend_from_backend(
@ -225,6 +226,9 @@ struct wlr_backend *wlr_drm_backend_create(struct wlr_session *session,
wlr_log(WLR_INFO, "Initializing DRM backend for %s (%s)", name, version->name);
drmFreeVersion(version);
drmDevice *dev_info = NULL;
drmGetDevice2(dev->fd, 0, &dev_info);
struct wlr_drm_backend *drm = calloc(1, sizeof(*drm));
if (!drm) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
@ -243,6 +247,9 @@ struct wlr_backend *wlr_drm_backend_create(struct wlr_session *session,
drm->fd = dev->fd;
drm->name = name;
drm->bus = get_drm_bus_str(dev_info);
drmFreeDevice(&dev_info);
if (parent != NULL) {
drm->parent = get_drm_backend_from_backend(parent);