blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: introduce wlr_drm_backend_get_non_master_fd

This commit is contained in:
Simon Zeni 2021-05-25 19:23:10 -04:00 committed by Simon Ser
parent e5a949a955
commit 94ed8f9496
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/drm/drm.c
View File

@ -3,6 +3,7 @@
#include <drm_fourcc.h> #include <drm_fourcc.h>
#include <drm_mode.h> #include <drm_mode.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
@ -1479,6 +1480,31 @@ void destroy_drm_connector(struct wlr_drm_connector *conn) {
free(conn); free(conn);
} }
int wlr_drm_backend_get_non_master_fd(struct wlr_backend *backend) {
assert(backend);
struct wlr_drm_backend *drm = get_drm_backend_from_backend(backend);
char *path = drmGetDeviceNameFromFd2(drm->fd);
if (!path) {
wlr_log(WLR_ERROR, "Failed to get device name from DRM fd");
return -1;
}
int fd = open(path, O_RDWR | O_CLOEXEC);
if (fd < 0) {
wlr_log_errno(WLR_ERROR, "Unable to clone DRM fd for client fd");
free(path);
return -1;
}
if (drmIsMaster(fd) && drmDropMaster(fd) < 0) {
wlr_log_errno(WLR_ERROR, "Failed to drop master");
return -1;
}
return fd;
}
/* TODO: make the function return a `wlr_drm_lease` to provide a destroy event /* TODO: make the function return a `wlr_drm_lease` to provide a destroy event
* that can be fired when the kernel notifies us through uevent that the lease * that can be fired when the kernel notifies us through uevent that the lease
* has been destroyed * has been destroyed

7
include/wlr/backend/drm.h
View File

@ -33,6 +33,13 @@ bool wlr_output_is_drm(struct wlr_output *output);
*/ */
uint32_t wlr_drm_connector_get_id(struct wlr_output *output); uint32_t wlr_drm_connector_get_id(struct wlr_output *output);
/**
* Tries to open non-master DRM FD. The compositor must not call `drmSetMaster`
* on the returned FD.
* Returns a valid opened DRM FD, or -1 on error.
*/
int wlr_drm_backend_get_non_master_fd(struct wlr_backend *backend);
/** /**
* Leases a given output to the caller. The output must be from the associated * Leases a given output to the caller. The output must be from the associated
* DRM backend. * DRM backend.