Fix missing dri2_load_driver on platform_drm
authorJean Hertel <jean.hertel@hotmail.com>
Tue, 10 Sep 2019 19:00:07 +0000 (21:00 +0200)
committerAdam Jackson <ajax@nwnk.net>
Wed, 11 Sep 2019 19:28:09 +0000 (19:28 +0000)
Signed-off-by: Jean Hertel <jean.hertel@hotmail.com>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
src/egl/drivers/dri2/platform_drm.c

index f2491054fe66e7cfb08ce209a7ed0b69034fd408..7b13129ee3aa2c85ac8c190878ea10e42ec39b72 100644 (file)
@@ -739,6 +739,21 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
    disp->Device = dev;
 
    dri2_dpy->driver_name = strdup(dri2_dpy->gbm_dri->driver_name);
+   dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER;
+
+   /* render nodes cannot use Gem names, and thus do not support
+    * the __DRI_DRI2_LOADER extension */
+   if (!dri2_dpy->is_render_node) {
+      if (!dri2_load_driver(disp)) {
+         err = "DRI2: failed to load driver";
+         goto cleanup;
+      }
+   } else {
+      if (!dri2_load_driver_dri3(disp)) {
+         err = "DRI3: failed to load driver";
+         goto cleanup;
+      }
+   }
 
    dri2_dpy->dri_screen = dri2_dpy->gbm_dri->screen;
    dri2_dpy->core = dri2_dpy->gbm_dri->core;