From 1d349a6484bd2dc2b7fafb12019b4b949fbf59bf Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 18 Mar 2021 21:47:05 +0100 Subject: [PATCH] Revert "egl: Don't add hardware device if there is no render node v2." This reverts commit 5743a36b2b32a91eaf82c8d109932fe4fea01233. Now that _eglAddDevice is always called with the correct software hint, no need to bail out if the device doesn't have a render node. On split render/display SoCs, the DRM device won't have a render node, yet rendering is hardware-accelerated (via kmsro). Signed-off-by: Simon Ser Fixes: 5743a36b2b32 ("egl: Don't add hardware device if there is no render node v2.") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4178 Part-of: --- src/egl/main/egldevice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/egl/main/egldevice.c b/src/egl/main/egldevice.c index 79048d84c0d..4e88897e2fa 100644 --- a/src/egl/main/egldevice.c +++ b/src/egl/main/egldevice.c @@ -109,9 +109,9 @@ static int _eglAddDRMDevice(drmDevicePtr device, _EGLDevice **out_dev) { _EGLDevice *dev; - const int wanted_nodes = 1 << DRM_NODE_RENDER | 1 << DRM_NODE_PRIMARY; - if ((device->available_nodes & wanted_nodes) != wanted_nodes) + if ((device->available_nodes & (1 << DRM_NODE_PRIMARY | + 1 << DRM_NODE_RENDER)) == 0) return -1; dev = _eglGlobal.DeviceList;