Mesa (master): egl/drm: Don't "fall back" to /dev/dri/ card0 if the first open fails

[Adam Jackson]

Module: Mesa
Branch: master
Commit: cd8ab40cd4a047ec64f59ff078b6558b1dab44a5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd8ab40cd4a047ec64f59ff078b6558b1dab44a5

Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Aug 24 14:52:14 2017 -0400

egl/drm: Don't "fall back" to /dev/dri/card0 if the first open fails

The snprintf stuff here already constructs the right name for the device
node, and if it doesn't, you configured Mesa wrong, don't do that.

Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 src/egl/drivers/dri2/platform_drm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c
index 259b1cd519..0ccbd9a30a 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -667,8 +667,6 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
       int n = snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, 0);
       if (n != -1 && n < sizeof(buf))
          dri2_dpy->fd = loader_open_device(buf);
-      if (dri2_dpy->fd < 0)
-         dri2_dpy->fd = loader_open_device("/dev/dri/card0");
       gbm = gbm_create_device(dri2_dpy->fd);
       if (gbm == NULL) {
          err = "DRI2: failed to create gbm device";