[Mesa-dev] [PATCH 2/3] egl/sl: use drmDevice API to enumerate available devices

[Eric Engestrom]

On Tuesday, 2019-02-05 15:31:07 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> This provides for a more comprehensive iteration and a more
> straight-forward codebase, while minimising the platform specifics.
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/egl/drivers/dri2/platform_surfaceless.c | 73 +++++++++++----------
>  1 file changed, 37 insertions(+), 36 deletions(-)
> 
> diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
> index d6e48ba11b2..e1151e3585c 100644
> --- a/src/egl/drivers/dri2/platform_surfaceless.c
> +++ b/src/egl/drivers/dri2/platform_surfaceless.c
> @@ -274,55 +274,56 @@ static const __DRIextension *swrast_loader_extensions[] = {
>  static bool
>  surfaceless_probe_device(_EGLDisplay *dpy, bool swrast)
>  {
> +#define MAX_DRM_DEVICES 32
>     struct dri2_egl_display *dri2_dpy = dpy->DriverData;
> -   const int limit = 64;

Any reason to drop the 64 down to 32?

Other than that, looks good to me:
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

> -   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 << DRM_NODE_RENDER)))
>           continue;
>  
> -      fd = loader_open_device(card_path);
> -      free(card_path);
> -      if (fd < 0)
> +      dri2_dpy->fd = loader_open_device(device->nodes[DRM_NODE_RENDER]);
> +      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);
> +      dpy->Device = _eglAddDevice(dri2_dpy->fd, swrast);
> +      if (!dpy->Device) {
> +         close(dri2_dpy->fd);
> +         dri2_dpy->fd = -1;
>           continue;
>        }
>  
> -      dri2_dpy->fd = fd;
> -      if (dri2_load_driver_dri3(dpy)) {
> -         _EGLDevice *dev = _eglAddDevice(dri2_dpy->fd, swrast);
> -         if (!dev) {
> -            dlclose(dri2_dpy->driver);
> -            _eglLog(_EGL_WARNING, "DRI2: failed to find EGLDevice");
> -            continue;
> -         }
> -         dpy->Device = dev;
> -         return true;
> -      }
> +      if (swrast)
> +         dri2_dpy->driver_name = strdup("kms_swrast");
> +      else
> +         dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd);
> +
> +      if (dri2_dpy->driver_name && dri2_load_driver_dri3(dpy))
> +         break;
>  
> -      close(fd);
> -      dri2_dpy->fd = -1;
>        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);
> +
> +   if (i == num_devices)
> +      return false;
> +
> +   if (swrast)
> +      dri2_dpy->loader_extensions = swrast_loader_extensions;
> +   else
> +      dri2_dpy->loader_extensions = image_loader_extensions;

I feel like you could've left this in the other `if (swrast)` above, but
it doesn't really matter.

>  
> -   return false;
> +   return true;
>  }
>  
>  static bool
> -- 
> 2.20.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev