Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-updates-src > by-pkgid > 920650749d98f8953fff38d3a9398ae7 > files > 4

libdrm-2.4.101-1.mga7.src.rpm

diff -Nurp libdrm-2.4.69.orig/xf86drm.c libdrm-2.4.69/xf86drm.c
--- libdrm-2.4.69.orig/xf86drm.c	2016-07-22 00:53:43.707958659 +0300
+++ libdrm-2.4.69/xf86drm.c	2016-07-22 00:58:03.107934880 +0300
@@ -484,11 +484,6 @@ int drmAvailable(void)
     int           fd;
 
     if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) {
-#ifdef __linux__
-        /* Try proc for backward Linux compatibility */
-        if (!access("/proc/dri/0", R_OK))
-            return 1;
-#endif
         return 0;
     }
 
@@ -661,38 +656,6 @@ static int drmOpenByName(const char *nam
         }
     }
 
-#ifdef __linux__
-    /* Backward-compatibility /proc support */
-    for (i = 0; i < 8; i++) {
-        char proc_name[64], buf[512];
-        char *driver, *pt, *devstring;
-        int  retcode;
-
-        sprintf(proc_name, "/proc/dri/%d/name", i);
-        if ((fd = open(proc_name, 0, 0)) >= 0) {
-            retcode = read(fd, buf, sizeof(buf)-1);
-            close(fd);
-            if (retcode) {
-                buf[retcode-1] = '\0';
-                for (driver = pt = buf; *pt && *pt != ' '; ++pt)
-                    ;
-                if (*pt) { /* Device is next */
-                    *pt = '\0';
-                    if (!strcmp(driver, name)) { /* Match */
-                        for (devstring = ++pt; *pt && *pt != ' '; ++pt)
-                            ;
-                        if (*pt) { /* Found busid */
-                            return drmOpenByBusid(++pt, type);
-                        } else { /* No busid */
-                            return drmOpenDevice(strtol(devstring, NULL, 0),i, type);
-                        }
-                    }
-                }
-            }
-        }
-    }
-#endif
-
     return -1;
 }