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 2026-04-09 17:33:07 +00:00
commit 1bff9c3ff4
7 changed files with 143 additions and 1 deletions

View file

@ -96,7 +96,7 @@ struct wlr_drm_backend {
bool addfb2_modifiers;
int fd;
char *name;
char *name, *bus;
struct wlr_device *dev;
struct liftoff_device *liftoff;

View file

@ -38,4 +38,7 @@ void match_connectors_with_crtcs(size_t num_conns,
size_t num_crtcs, const uint32_t prev_crtcs[static restrict num_crtcs],
uint32_t new_crtcs[static restrict num_crtcs]);
char *get_drm_bus_str(const drmDevice *dev);
bool parse_dp_mst_path(const char *path, uint32_t *parent_conn_id, const char **child_path);
#endif