Revert "libdrm: Fix issue about differrent domainID but same BDF"

This reverts commit 56c21f877bda7b8c62c3d7925b070b5113d807f2.

There were issues pointed out during review that were not addressed.
Would love to have this re-land, once those are addressed.

diff --git a/xf86drm.c b/xf86drm.c
index 7be03d2..fe822ca 100644 (file)
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -586,34 +586,11 @@ static int drmOpenByBusid(const char *busid, int type)
     if (base < 0)
         return -1;
 
-    /* We need to try for 1.4 first for proper PCI domain support */
     drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid);
     for (i = base; i < base + DRM_MAX_MINOR; i++) {
         fd = drmOpenMinor(i, 1, type);
         drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd);
         if (fd >= 0) {
-            sv.drm_di_major = 1;
-            sv.drm_di_minor = 4;
-            sv.drm_dd_major = -1;        /* Don't care */
-            sv.drm_dd_minor = -1;        /* Don't care */
-            if (!drmSetInterfaceVersion(fd, &sv)) {
-                buf = drmGetBusid(fd);
-                drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf);
-                if (buf && drmMatchBusID(buf, busid, 1)) {
-                    drmFreeBusid(buf);
-                    return fd;
-                }
-                if (buf)
-                    drmFreeBusid(buf);
-            }
-            close(fd);
-        }
-    }
-
-   for (i = base; i < base + DRM_MAX_MINOR; i++) {
-        fd = drmOpenMinor(i, 1, type);
-        drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd);
-        if (fd >= 0) {
             /* We need to try for 1.4 first for proper PCI domain support
              * and if that fails, we know the kernel is busted
              */