Module Name: xsrc
Committed By: riastradh
Date: Sun Sep 9 03:05:37 UTC 2018
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drm.c
Log Message:
Don't make setversion failure fatal -- only master can set it.
PR pkg/51795
PR kern/51786
XXX pullup-7
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/libdrm/dist/xf86drm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.17 xsrc/external/mit/libdrm/dist/xf86drm.c:1.18
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.17 Sun Sep 9 02:00:29 2018
+++ xsrc/external/mit/libdrm/dist/xf86drm.c Sun Sep 9 03:05:36 2018
@@ -3036,8 +3036,10 @@ static int drmParseSubsystemType(int maj
sv.drm_dd_major = -1;
sv.drm_dd_minor = -1;
if (drmSetInterfaceVersion(fd, &sv)) {
- (void)close(fd);
- return -ENODEV;
+ /*
+ * We're probably not the master. Hope the master already
+ * set the version to >=1.1 so that we can get the busid.
+ */
}
}
