egl/dri: flesh out and use dri2_create_drawable()

[mesa.git] / src / egl / drivers / dri2 / platform_surfaceless.c

diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
index 42bd17e83411f977bdd983f79fd4ee02691dceba..ce9f7d0f980ce279a60d88611b5c8a101ceaa0ad 100644 (file)
--- a/src/egl/drivers/dri2/platform_surfaceless.c
+++ b/src/egl/drivers/dri2/platform_surfaceless.c
@@ -124,7 +124,8 @@ dri2_surfaceless_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
       return NULL;
    }
 
-   if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list, false))
+   if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list,
+                          false, NULL))
       goto cleanup_surface;
 
    config = dri2_get_dri_config(dri2_conf, type,
@@ -135,13 +136,8 @@ dri2_surfaceless_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
       goto cleanup_surface;
    }
 
-   dri2_surf->dri_drawable =
-      dri2_dpy->image_driver->createNewDrawable(dri2_dpy->dri_screen, config,
-                                                dri2_surf);
-   if (dri2_surf->dri_drawable == NULL) {
-      _eglError(EGL_BAD_ALLOC, "image->createNewDrawable");
+   if (!dri2_create_drawable(dri2_dpy, config, dri2_surf))
       goto cleanup_surface;
-    }
 
    if (conf->RedSize == 5)
       dri2_surf->visual = __DRI_IMAGE_FORMAT_RGB565;
@@ -254,8 +250,6 @@ static const __DRIswrastLoaderExtension swrast_loader_extension = {
    .getImage        = NULL,
 };
 
-#define DRM_RENDER_DEV_NAME  "%s/renderD%d"
-
 static const __DRIextension *image_loader_extensions[] = {
    &image_loader_extension.base,
    &image_lookup_extension.base,
@@ -274,55 +268,68 @@ static const __DRIextension *swrast_loader_extensions[] = {
 static bool
 surfaceless_probe_device(_EGLDisplay *disp, bool swrast)
 {
+#define MAX_DRM_DEVICES 64
+   const unsigned node_type = swrast ? DRM_NODE_PRIMARY : DRM_NODE_RENDER;
    struct dri2_egl_display *dri2_dpy = disp->DriverData;
-   const int limit = 64;
-   const int base = 128;
-   int fd;
-   int i;
-
-   /* Attempt to find DRM device. */
-   for (i = 0; i < limit; ++i) {
-      char *card_path;
-      if (asprintf(&card_path, DRM_RENDER_DEV_NAME, DRM_DIR_NAME, base + i) < 0)
+   drmDevicePtr device, devices[MAX_DRM_DEVICES] = { NULL };
+   int i, num_devices;
+
+   num_devices = drmGetDevices2(0, devices, ARRAY_SIZE(devices));
+   if (num_devices < 0)
+      return false;
+
+   for (i = 0; i < num_devices; ++i) {
+      device = devices[i];
+
+      if (!(device->available_nodes & (1 << node_type)))
          continue;
 
-      fd = loader_open_device(card_path);
-      free(card_path);
-      if (fd < 0)
+      dri2_dpy->fd = loader_open_device(device->nodes[node_type]);
+      if (dri2_dpy->fd < 0)
          continue;
 
-      if (swrast) {
-         dri2_dpy->driver_name = strdup("kms_swrast");
-         dri2_dpy->loader_extensions = swrast_loader_extensions;
-      } else {
-         dri2_dpy->driver_name = loader_get_driver_for_fd(fd);
-         dri2_dpy->loader_extensions = image_loader_extensions;
-      }
-      if (!dri2_dpy->driver_name) {
-         close(fd);
+      disp->Device = _eglAddDevice(dri2_dpy->fd, swrast);
+      if (!disp->Device) {
+         close(dri2_dpy->fd);
+         dri2_dpy->fd = -1;
          continue;
       }
 
-      dri2_dpy->fd = fd;
-      if (dri2_load_driver_dri3(disp)) {
-         _EGLDevice *dev = _eglAddDevice(dri2_dpy->fd, swrast);
-         if (!dev) {
-            dlclose(dri2_dpy->driver);
-            _eglLog(_EGL_WARNING, "DRI2: failed to find EGLDevice");
-            continue;
-         }
-         disp->Device = dev;
-         return true;
+      char *driver_name = loader_get_driver_for_fd(dri2_dpy->fd);
+      if (swrast) {
+         /* Use kms swrast only with vgem / virtio_gpu.
+          * virtio-gpu fallbacks to software rendering when 3D features
+          * are unavailable since 6c5ab, and kms_swrast is more
+          * feature complete than swrast.
+          */
+         if (strcmp(driver_name, "vgem") == 0 ||
+             strcmp(driver_name, "virtio_gpu") == 0)
+            dri2_dpy->driver_name = strdup("kms_swrast");
+         free(driver_name);
+      } else {
+         /* Use the given hardware driver */
+         dri2_dpy->driver_name = driver_name;
       }
 
-      close(fd);
-      dri2_dpy->fd = -1;
+      if (dri2_dpy->driver_name && dri2_load_driver_dri3(disp))
+         break;
+
       free(dri2_dpy->driver_name);
       dri2_dpy->driver_name = NULL;
-      dri2_dpy->loader_extensions = NULL;
+      close(dri2_dpy->fd);
+      dri2_dpy->fd = -1;
    }
+   drmFreeDevices(devices, num_devices);
 
-   return false;
+   if (i == num_devices)
+      return false;
+
+   if (swrast)
+      dri2_dpy->loader_extensions = swrast_loader_extensions;
+   else
+      dri2_dpy->loader_extensions = image_loader_extensions;
+
+   return true;
 }
 
 static bool