From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bryce Harrington Subject: [PATCH 5/8] xfree86: After 2 sec, abort setting drm interface version. Date: Fri, 15 Mar 2013 11:02:55 -0700 Message-ID: <1363370578-30443-6-git-send-email-bryce@canonical.com> References: <1363370578-30443-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 48525E6AC0 for ; Fri, 15 Mar 2013 11:03:18 -0700 (PDT) In-Reply-To: <1363370578-30443-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@chris-wilson.co.uk Cc: Bryce Harrington 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 | 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