Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/trunk]: xsrc/external/mit/libdrm/dist Don't make setversion failure fat...



details:   https://anonhg.NetBSD.org/xsrc/rev/df3ef1c40af7
branches:  trunk
changeset: 9987:df3ef1c40af7
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 09 03:05:36 2018 +0000

description:
Don't make setversion failure fatal -- only master can set it.

PR pkg/51795
PR kern/51786

XXX pullup-7
XXX pullup-8

diffstat:

 external/mit/libdrm/dist/xf86drm.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r b5aa54fc103c -r df3ef1c40af7 external/mit/libdrm/dist/xf86drm.c
--- a/external/mit/libdrm/dist/xf86drm.c        Sun Sep 09 02:00:29 2018 +0000
+++ b/external/mit/libdrm/dist/xf86drm.c        Sun Sep 09 03:05:36 2018 +0000
@@ -3036,8 +3036,10 @@
        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.
+            */
        }
     }
 



Home | Main Index | Thread Index | Old Index