drm: Branch 'master'

 xf86drm.c |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 61ff9779e37179ed5106c0e2452e16500127fb9e
Author: Dave Airlie <[email protected]>
Date:   Wed Oct 25 07:43:56 2017 +0100

    drm/syncobj: fix some whitespace issues
    
    These had tabs, just remove them.
    
    Signed-off-by: Dave Airlie <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 8a327170..c44621c1 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -4155,7 +4155,7 @@ int drmSyncobjCreate(int fd, uint32_t flags, uint32_t *handle)
     args.handle = 0;
     ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_CREATE, &args);
     if (ret)
-	return ret;
+        return ret;
     *handle = args.handle;
     return 0;
 }
@@ -4179,7 +4179,7 @@ int drmSyncobjHandleToFD(int fd, uint32_t handle, int *obj_fd)
     args.handle = handle;
     ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, &args);
     if (ret)
-	return ret;
+        return ret;
     *obj_fd = args.fd;
     return 0;
 }
@@ -4194,7 +4194,7 @@ int drmSyncobjFDToHandle(int fd, int obj_fd, uint32_t *handle)
     args.handle = 0;
     ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE, &args);
     if (ret)
-	return ret;
+        return ret;
     *handle = args.handle;
     return 0;
 }
@@ -4221,29 +4221,29 @@ int drmSyncobjExportSyncFile(int fd, uint32_t handle, int *sync_file_fd)
     args.flags = DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE;
     ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, &args);
     if (ret)
-	return ret;
+        return ret;
     *sync_file_fd = args.fd;
     return 0;
 }
 
 int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles,
-		   int64_t timeout_nsec, unsigned flags,
-		   uint32_t *first_signaled)
+                   int64_t timeout_nsec, unsigned flags,
+                   uint32_t *first_signaled)
 {
-	struct drm_syncobj_wait args;
-	int ret;
+    struct drm_syncobj_wait args;
+    int ret;
 
-	memclear(args);
-	args.handles = (intptr_t)handles;
-	args.timeout_nsec = timeout_nsec;
-	args.count_handles = num_handles;
-	args.flags = flags;
+    memclear(args);
+    args.handles = (intptr_t)handles;
+    args.timeout_nsec = timeout_nsec;
+    args.count_handles = num_handles;
+    args.flags = flags;
 
-	ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, &args);
-	if (ret < 0)
-		return ret;
+    ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, &args);
+    if (ret < 0)
+        return ret;
 
-	if (first_signaled)
-		*first_signaled = args.first_signaled;
-	return ret;
+    if (first_signaled)
+        *first_signaled = args.first_signaled;
+    return ret;
 }

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--