From: Bryce Harrington Subject: [PATCH v2 4/7] xfree86: Keep trying to set interface on drm for 2 seconds. Date: Mon, 18 Mar 2013 13:51:48 -0700 Message-ID: <1363639911-21239-5-git-send-email-bryce@canonical.com> References: <1363639911-21239-1-git-send-email-bryce@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp.outflux.net (smtp.outflux.net [198.145.64.163]) by gabe.freedesktop.org (Postfix) with ESMTP id 52C48E6237 for ; Mon, 18 Mar 2013 13:52:14 -0700 (PDT) In-Reply-To: <1363639911-21239-1-git-send-email-bryce@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org, Chris Wilson Cc: Maarten Lankhorst List-Id: intel-gfx@lists.freedesktop.org And if we've had to delay booting due to not being able to set the interface, fess up. Signed-off-by: Bryce Harrington --- hw/xfree86/os-support/linux/lnx_platform.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/os-support/linux/lnx_platform.c b/hw/xfree86/os-support/linux/lnx_platform.c index 3ae2db1..4094866 100644 --- a/hw/xfree86/os-support/linux/lnx_platform.c +++ b/hw/xfree86/os-support/linux/lnx_platform.c @@ -26,16 +26,26 @@ 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; - 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); + 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 (tries > 1) + LogMessage(X_INFO, "setversion 1.4 succeeded on try #%d\n", tries); + break; + } + usleep(1000); + } if (err) { ErrorF("setversion 1.4 failed: %s\n", strerror(-err)); goto out; -- 1.7.9.5