[Intel-gfx] [PATCH 5/8] xfree86: After 2 sec, abort setting drm interface version.

[Bryce Harrington]

And if we've had to delay booting due to not being able to set the
interface, fess up.

Signed-off-by: Bryce Harrington <bryce at canonical.com>
---
 hw/xfree86/os-support/linux/lnx_platform.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/os-support/linux/lnx_platform.c b/hw/xfree86/os-support/linux/lnx_platform.c
index c4d128e..4094866 100644
--- a/hw/xfree86/os-support/linux/lnx_platform.c
+++ b/hw/xfree86/os-support/linux/lnx_platform.c
@@ -26,19 +26,24 @@ get_drm_info(struct OdevAttributes *attribs, char *path)
     char *buf;
     int fd;
     int err = 0;
+    int tries = 0;
 
     fd = open(path, O_RDWR, O_CLOEXEC);
     if (fd == -1)
         return FALSE;
 
-    while (1) {
+    while (tries++ < 2000) {
 	sv.drm_di_major = 1;
 	sv.drm_di_minor = 4;
 	sv.drm_dd_major = -1;       /* Don't care */
 	sv.drm_dd_minor = -1;       /* Don't care */
+
 	err = drmSetInterfaceVersion(fd, &sv);
-	if (!err)
+	if (!err) {
+	    if (tries > 1)
+		LogMessage(X_INFO, "setversion 1.4 succeeded on try #%d\n", tries);
 	    break;
+	}
 	usleep(1000);
     }
     if (err) {
-- 
1.7.9.5