From 24e68525dcdfd5ece6ba8ca9033513dc5d2d1b3e Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Tue, 21 Jan 2020 18:41:38 +0100 Subject: [PATCH] libdrm: drmCheckModesettingSupported: Fix for FreeBSD Remove some useless busid rewritting. Signed-off-by: Emmanuel Vadot Reviewed-by: Eric Engestrom Reviewed-by: Emil Velikov --- xf86drmMode.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xf86drmMode.c b/xf86drmMode.c index 2399e8ec..6fa2e83f 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -800,19 +800,11 @@ drm_public int drmCheckModesettingSupported(const char *busid) if (found) return 0; #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) - char kbusid[1024], sbusid[1024]; + char sbusid[1024]; char oid[128]; - int domain, bus, dev, func; int i, modesetting, ret; size_t len; - ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev, - &func); - if (ret != 4) - return -EINVAL; - snprintf(kbusid, sizeof(kbusid), "pci:%04x:%02x:%02x.%d", domain, bus, - dev, func); - /* How many GPUs do we expect in the machine ? */ for (i = 0; i < 16; i++) { snprintf(oid, sizeof(oid), "hw.dri.%d.busid", i); @@ -823,7 +815,7 @@ drm_public int drmCheckModesettingSupported(const char *busid) continue; return -EINVAL; } - if (strcmp(sbusid, kbusid) != 0) + if (strcmp(sbusid, busid) != 0) continue; snprintf(oid, sizeof(oid), "hw.dri.%d.modesetting", i); len = sizeof(modesetting);