mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: drop split render/display workaround

Browse source
This commit is contained in:
Simon Ser 2023-10-05 16:14:59 +02:00
parent d7af61f188
commit f7fb398fcd
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
render/vulkan/vulkan.c
View file

@ -376,32 +376,24 @@ int vulkan_open_phdev_drm_fd(VkPhysicalDevice phdev) {
}; };
vkGetPhysicalDeviceProperties2(phdev, &props); vkGetPhysicalDeviceProperties2(phdev, &props);
dev_t devid; if (!drm_props.hasRender) {
if (drm_props.hasRender) { wlr_log(WLR_ERROR, "Physical device is missing render node");
devid = makedev(drm_props.renderMajor, drm_props.renderMinor);
} else if (drm_props.hasPrimary) {
devid = makedev(drm_props.primaryMajor, drm_props.primaryMinor);
} else {
wlr_log(WLR_ERROR, "Physical device is missing both render and primary nodes");
return -1; return -1;
} }
dev_t devid = makedev(drm_props.renderMajor, drm_props.renderMinor);
drmDevice *device = NULL; drmDevice *device = NULL;
if (drmGetDeviceFromDevId(devid, 0, &device) != 0) { if (drmGetDeviceFromDevId(devid, 0, &device) != 0) {
wlr_log_errno(WLR_ERROR, "drmGetDeviceFromDevId failed"); wlr_log_errno(WLR_ERROR, "drmGetDeviceFromDevId failed");
return -1; return -1;
} }
const char *name = NULL; if (!(device->available_nodes & (1 << DRM_NODE_RENDER))) {
if (device->available_nodes & (1 << DRM_NODE_RENDER)) { wlr_log(WLR_ERROR, "DRM device has no render node");
name = device->nodes[DRM_NODE_RENDER]; return -1;
} else {
assert(device->available_nodes & (1 << DRM_NODE_PRIMARY));
name = device->nodes[DRM_NODE_PRIMARY];
wlr_log(WLR_DEBUG, "DRM device %s has no render node, "
"falling back to primary node", name);
} }
const char *name = device->nodes[DRM_NODE_RENDER];
int drm_fd = open(name, O_RDWR | O_NONBLOCK | O_CLOEXEC); int drm_fd = open(name, O_RDWR | O_NONBLOCK | O_CLOEXEC);
if (drm_fd < 0) { if (drm_fd < 0) {
wlr_log_errno(WLR_ERROR, "Failed to open DRM node %s", name); wlr_log_errno(WLR_ERROR, "Failed to open DRM node %s", name);