From d9a4059d400bf288aadd17c04885cb9b0fb93989 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 14 Jan 2014 15:47:48 +0100 Subject: [PATCH] config-udev: Don't try to add drm devices twice Before this commit we were trying to add most drm devices twice, once from xf86platformProbe() and once from config_udev_init(). This results in somewhat confusing messages in Xorg.log, ie: (II) xfree86: Adding drm device (/dev/dri/card0) Later followed by: (II) config/udev: Adding drm device (/dev/dri/card0) By filtering out duplicate drm devices we avoid these confusing messages. Signed-off-by: Hans de Goede Acked-by: Peter Hutterer --- config/udev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/udev.c b/config/udev.c index 208518572..d70eeb48c 100644 --- a/config/udev.c +++ b/config/udev.c @@ -112,6 +112,10 @@ device_added(struct udev_device *udev_device) if (strncmp(sysname, "card", 4) != 0) return; + /* Check for devices already added through xf86platformProbe() */ + if (xf86_find_platform_device_by_devnum(major(devnum), minor(devnum))) + return; + LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path); config_udev_odev_setup_attribs(path, syspath, major(devnum),