Mesa (staging/21.0): Revert "egl: Don't add hardware device if there is no render node v2."

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 9a439ebcac0ec27ee8ed9b90e266ac2df5333918
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a439ebcac0ec27ee8ed9b90e266ac2df5333918

Author: Simon Ser <contact at emersion.fr>
Date:   Thu Mar 18 21:47:05 2021 +0100

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 <contact at 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>
(cherry picked from commit 1d349a6484bd2dc2b7fafb12019b4b949fbf59bf)

---

 .pick_status.json        | 2 +-
 src/egl/main/egldevice.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 782aa31547c..754671c1c8a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -103,7 +103,7 @@
         "description": "Revert \"egl: Don't add hardware device if there is no render node v2.\"",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "5743a36b2b32a91eaf82c8d109932fe4fea01233"
     },
diff --git a/src/egl/main/egldevice.c b/src/egl/main/egldevice.c
index d224345f5c9..88942896b99 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;