Revert "egl: Don't add hardware device if there is no render node v2."
authorSimon Ser <contact@emersion.fr>
Thu, 18 Mar 2021 20:47:05 +0000 (21:47 +0100)
committerMarge Bot <eric+marge@anholt.net>
Fri, 26 Mar 2021 10:32:31 +0000 (10:32 +0000)
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 <contact@emersion.fr>
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9697>

src/egl/main/egldevice.c

index 79048d8..4e88897 100644 (file)
@@ -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;