xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |   22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 404c64752774d23a2db9aa3134f6ada3155708c9
Author: jimqu <Jim.Qu at amd.com>
Date:   Wed Dec 14 11:46:16 2016 +0900

    udev_monitor_receive_device() will block when hotplug monitor
    
    udev_monitor_receive_device() will block and wait for the event of udev
    use select() to ensure that this will not block.
    
    Signed-off-by: JimQu <Jim.Qu at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    (Cherry picked from amdgpu commit 732cf4d3a248b288532ad0f3443da49e08dc7507)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e02a6f5..b183a20 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2717,10 +2717,26 @@ drmmode_handle_uevents(int fd, void *closure)
 	ScrnInfoPtr scrn = drmmode->scrn;
 	struct udev_device *dev;
 	Bool received = FALSE;
+	struct timeval tv;
+	fd_set readfd;
+	int ret;
+
+	FD_ZERO(&readfd);
+	FD_SET(fd, &readfd);
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
 
-	while ((dev = udev_monitor_receive_device(drmmode->uevent_monitor))) {
-		udev_device_unref(dev);
-		received = TRUE;
+	while (1) {
+		ret = select(fd + 1, &readfd, NULL, NULL, &tv);
+		/* Check if our file descriptor has received data. */
+		if (!(ret > 0 && FD_ISSET(fd, &readfd)))
+			break;
+		/* Make the call to receive device. select() ensured that this will not be blocked. */
+		dev = udev_monitor_receive_device(drmmode->uevent_monitor);
+		if (dev) {
+			udev_device_unref(dev);
+			received = TRUE;
+		}
 	}
 
 	if (received)