hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

render/egl: reopen DRM node for GBM

Browse source 
This will be necessary for the next patch, to avoid messing up BO
handles shared between the GL implementation and the DRM backend.
This commit is contained in:
Simon Ser 2021-08-23 18:39:31 +02:00 committed by Simon Zeni
parent 3ce2ea9e16
commit 749b3c00f0
1 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
render/egl.c
View file

@ -421,6 +421,28 @@ static EGLDeviceEXT get_egl_device_from_drm_fd(struct wlr_egl *egl,
return egl_device; return egl_device;
} }
static int open_render_node(int drm_fd) {
char *render_name = drmGetRenderDeviceNameFromFd(drm_fd);
if (render_name == NULL) {
// This can happen on split render/display platforms, fallback to
// primary node
render_name = drmGetPrimaryDeviceNameFromFd(drm_fd);
if (render_name == NULL) {
wlr_log_errno(WLR_ERROR, "drmGetPrimaryDeviceNameFromFd failed");
return -1;
}
wlr_log(WLR_DEBUG, "DRM device '%s' has no render node, "
"falling back to primary node", render_name);
}
int render_fd = open(render_name, O_RDWR | O_CLOEXEC);
if (render_fd < 0) {
wlr_log_errno(WLR_ERROR, "Failed to open DRM node '%s'", render_name);
}
free(render_name);
return render_fd;
}
struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd) { struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd) {
struct wlr_egl *egl = egl_create(); struct wlr_egl *egl = egl_create();
if (egl == NULL) { if (egl == NULL) {
@ -447,8 +469,15 @@ struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd) {
} }
if (egl->exts.KHR_platform_gbm) { if (egl->exts.KHR_platform_gbm) {
egl->gbm_device = gbm_create_device(drm_fd); int gbm_fd = open_render_node(drm_fd);
if (gbm_fd < 0) {
wlr_log(WLR_ERROR, "Failed to open DRM render node");
goto error;
}
egl->gbm_device = gbm_create_device(gbm_fd);
if (!egl->gbm_device) { if (!egl->gbm_device) {
close(gbm_fd);
wlr_log(WLR_ERROR, "Failed to create GBM device"); wlr_log(WLR_ERROR, "Failed to create GBM device");
goto error; goto error;
} }
@ -459,6 +488,7 @@ struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd) {
} }
gbm_device_destroy(egl->gbm_device); gbm_device_destroy(egl->gbm_device);
close(gbm_fd);
} else { } else {
wlr_log(WLR_DEBUG, "KHR_platform_gbm not supported"); wlr_log(WLR_DEBUG, "KHR_platform_gbm not supported");
} }
@ -490,7 +520,9 @@ void wlr_egl_destroy(struct wlr_egl *egl) {
eglReleaseThread(); eglReleaseThread();
if (egl->gbm_device) { if (egl->gbm_device) {
int gbm_fd = gbm_device_get_fd(egl->gbm_device);
gbm_device_destroy(egl->gbm_device); gbm_device_destroy(egl->gbm_device);
close(gbm_fd);
} }
free(egl); free(egl);