libdrm/libdrm-2.4.0-no-bc.patch

55 lines
1.4 KiB
Diff
Raw Normal View History

2015-03-22 23:09:52 +00:00
diff -up libdrm-2.4.60/xf86drm.c.no-bc libdrm-2.4.60/xf86drm.c
--- libdrm-2.4.60/xf86drm.c.no-bc 2015-03-23 09:04:17.272458959 +1000
+++ libdrm-2.4.60/xf86drm.c 2015-03-23 09:07:36.856720490 +1000
@@ -482,11 +482,6 @@ int drmAvailable(void)
int fd;
2015-03-22 23:09:52 +00:00
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;
}
2015-03-22 23:09:52 +00:00
@@ -659,38 +654,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 */
2015-03-22 23:09:52 +00:00
- return drmOpenByBusid(++pt, type);
- } else { /* No busid */
2015-03-22 23:09:52 +00:00
- return drmOpenDevice(strtol(devstring, NULL, 0),i, type);
- }
- }
- }
- }
- }
- }
-#endif
-
return -1;
}