drm: Branch 'master'

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

New commits:
commit b1e63d9ee622f3f08127bab43bf6817101b870a8
Author: Bas Nieuwenhuizen <[email protected]>
Date:   Tue Feb 6 11:21:35 2018 +0100

    drm: Fix 32-bit drmSyncobjWait.
    
    Otherwise we get an EFAULT, at least on a 64-bit kernel.
    
    Fixes: 2048a9e7 "drm: add drmSyncobjWait wrapper"
    Reviewed-by: Christian König <[email protected]>
    Reviewed-by: Dave Airlie <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 74b4e230..1e87610b 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -4271,7 +4271,7 @@ int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles,
     int ret;
 
     memclear(args);
-    args.handles = (intptr_t)handles;
+    args.handles = (uintptr_t)handles;
     args.timeout_nsec = timeout_nsec;
     args.count_handles = num_handles;
     args.flags = flags;

------------------------------------------------------------------------------
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