drm: Branch 'master'

 xf86drm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bde3b9b689407eadd1cb0d9348a0fd7906c880e2
Author: Chunming Zhou <[email protected]>
Date:   Wed Feb 7 11:22:32 2018 +0800

    fix return value for syncobj wait
    
    otherwise -ETIME is missed.
    
    Signed-off-by: Chunming Zhou <[email protected]>
    Reviewed-by: Christian König <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 1e87610b..344326db 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -4278,7 +4278,7 @@ int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles,
 
     ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, &args);
     if (ret < 0)
-        return ret;
+        return -errno;
 
     if (first_signaled)
         *first_signaled = args.first_signaled;

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches