On 21/05/14 02:39, Gary Wong wrote:
> loader_get_pci_id_for_fd() and loader_get_device_name_for_fd() now attempt
> all available strategies to identify the hardware, instead of conditionally
> compiling in a single test. The existing libudev and DRM approaches have
> been retained, attempting first libudev (if available) and then DRM (if
> necessary).
>
Hi Gary,
A couple trivial nitpicks and a handful of whitespace. With those fixed
Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
> Signed-off-by: Gary Wong <g...@gnu.org>
> ---
> src/loader/loader.c | 64
> ++++++++++++++++++++++++++++++++++++++---------------
> 1 file changed, 46 insertions(+), 18 deletions(-)
>
> diff --git a/src/loader/loader.c b/src/loader/loader.c
> index 666d015..d8246e8 100644
> --- a/src/loader/loader.c
> +++ b/src/loader/loader.c
> @@ -113,8 +113,8 @@ udev_dlopen_handle(void)
> udev_handle = dlopen("libudev.so.0", RTLD_LOCAL | RTLD_LAZY);
>
> if (!udev_handle) {
> - log_(_LOADER_FATAL, "Couldn't dlopen libudev.so.1 or
> libudev.so.0, "
> - "driver detection may be broken.\n");
> + log_(_LOADER_WARNING, "Couldn't dlopen libudev.so.1 or "
> + "libudev.so.0, driver detection may be broken.\n");
> }
> }
> }
> @@ -122,16 +122,19 @@ udev_dlopen_handle(void)
> return udev_handle;
> }
>
> +static int dlcheck_failed;
static int dlsym_failed = 0;
Personally find the above easier to follow.
> +
> static void *
> -asserted_dlsym(void *dlopen_handle, const char *name)
> +checked_dlsym(void *dlopen_handle, const char *name)
> {
> void *result = dlsym(dlopen_handle, name);
> - assert(result);
> + if (!result)
> + dlcheck_failed = 1;
> return result;
> }
>
> #define UDEV_SYMBOL(ret, name, args) \
> - ret (*name) args = asserted_dlsym(udev_dlopen_handle(), #name);
> + ret (*name) args = checked_dlsym(udev_dlopen_handle(), #name);
>
>
> static inline struct udev_device *
> @@ -142,6 +145,9 @@ udev_device_new_from_fd(struct udev *udev, int fd)
> UDEV_SYMBOL(struct udev_device *, udev_device_new_from_devnum,
> (struct udev *udev, char type, dev_t devnum));
>
> + if (dlcheck_failed)
> + return NULL;
> +
Whitespace.
> if (fstat(fd, &buf) < 0) {
> log_(_LOADER_WARNING, "MESA-LOADER: failed to stat fd %d\n", fd);
> return NULL;
> @@ -157,8 +163,8 @@ udev_device_new_from_fd(struct udev *udev, int fd)
> return device;
> }
>
> -int
> -loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
> +static int
> +libudev_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
> {
> struct udev *udev = NULL;
> struct udev_device *device = NULL, *parent;
> @@ -174,6 +180,9 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int
> *chip_id)
>
> *chip_id = -1;
>
> + if (dlcheck_failed)
> + return 0;
> +
Ditto.
> udev = udev_new();
> device = udev_device_new_from_fd(udev, fd);
> if (!device)
> @@ -201,16 +210,16 @@ out:
>
> return (*chip_id >= 0);
> }
> +#endif
>
> -#elif !defined(__NOT_HAVE_DRM_H)
> -
> +#if !defined(__NOT_HAVE_DRM_H)
> /* for i915 */
> #include <i915_drm.h>
> /* for radeon */
> #include <radeon_drm.h>
>
> -int
> -loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
> +static int
> +drm_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
> {
> drmVersionPtr version;
>
> @@ -272,23 +281,29 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int
> *chip_id)
>
> return (*chip_id >= 0);
> }
> +#endif
>
> -#else
>
> int
> loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
> {
> +#if HAVE_LIBUDEV
> + if (libudev_get_pci_id_for_fd(fd, vendor_id, chip_id))
> + return 1;
> +#endif
> +#if !defined(__NOT_HAVE_DRM_H)
> + if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id))
> + return 1;
> +#endif
> return 0;
> }
>
> -#endif
> -
>
> -char *
> -loader_get_device_name_for_fd(int fd)
> +#ifdef HAVE_LIBUDEV
> +static char *
> +libudev_get_device_name_for_fd(int fd)
> {
> char *device_name = NULL;
> -#ifdef HAVE_LIBUDEV
> struct udev *udev;
> struct udev_device *device;
> const char *const_device_name;
> @@ -312,9 +327,22 @@ loader_get_device_name_for_fd(int fd)
> out:
> udev_device_unref(device);
> udev_unref(udev);
> -#endif
> return device_name;
> }
> +#endif
> +
Whitespace.
> +
> +char *
> +loader_get_device_name_for_fd(int fd)
> +{
> + char *result;
char *result = NULL;
> +
Whitespace.
> +#if HAVE_LIBUDEV
> + if ((result = libudev_get_device_name_for_fd(fd)))
> + return result;
> +#endif
> + return NULL;
return result;
To silence the compiler warning about unused variable :)
> +}
>
> char *
> loader_get_driver_for_fd(int fd, unsigned driver_types)
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
