Merge remote branch 'origin/master' into modesetting-101

Conflicts:

	linux-core/drm_compat.c

1 files changed, 9 insertions, 14 deletions

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 13e99555..bcf562d5 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -2806,23 +2806,18 @@ int drmBOWaitIdle(int fd, drmBO *buf, unsigned hint)
     }
     return 0;
 }
-	
+
 int drmBOBusy(int fd, drmBO *buf, int *busy)
 {
-    if (!(buf->flags & DRM_BO_FLAG_SHAREABLE) &&
-	!(buf->replyFlags & DRM_BO_REP_BUSY)) {
-	*busy = 0;
-	return 0;
-    }
-    else {
-	int ret = drmBOInfo(fd, buf);
-	if (ret)
-	    return ret;
-	*busy = (buf->replyFlags & DRM_BO_REP_BUSY);
-	return 0;
-    }
+    int ret = drmBOInfo(fd, buf);
+
+    if (ret)
+	return ret;
+
+    *busy = (buf->replyFlags & DRM_BO_REP_BUSY);
+    return 0;
 }
-    
+
 int drmMMInit(int fd, unsigned long pOffset, unsigned long pSize,
 	      unsigned memType)
 {