From patchwork Fri Mar 15 18:02:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryce Harrington X-Patchwork-Id: 2279861 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3313C3FC8F for ; Fri, 15 Mar 2013 18:05:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 301F0E5EB4 for ; Fri, 15 Mar 2013 11:05:52 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from smtp.outflux.net (smtp.outflux.net [198.145.64.163]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F928E6ABB for ; Fri, 15 Mar 2013 11:03:18 -0700 (PDT) Received: from humber.bryceharrington.org (static-50-53-70-170.bvtn.or.frontiernet.net [50.53.70.170]) (authenticated bits=0) by vinyl.outflux.net (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id r2FI36UQ013852 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 15 Mar 2013 11:03:14 -0700 From: Bryce Harrington To: intel-gfx@lists.freedesktop.org, chris@chris-wilson.co.uk Date: Fri, 15 Mar 2013 11:02:58 -0700 Message-Id: <1363370578-30443-9-git-send-email-bryce@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363370578-30443-1-git-send-email-bryce@canonical.com> References: <1363370578-30443-1-git-send-email-bryce@canonical.com> X-MIMEDefang-Filter: outflux$Revision: 1.316 $ X-HELO: humber.bryceharrington.org X-Scanned-By: MIMEDefang 2.71 on 198.145.64.163 Cc: Bryce Harrington Subject: [Intel-gfx] [PATCH 8/8] xfree86: Also handle EAGAIN errors from drmSetInterfaceVersion(). X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org It has been suggested that the kernel may pass EAGAIN when the device is unavailable. This hasn't been seen in practice, and examination of the function definition in libdrm suggests EAGAIN is handled internally so would not be seen by the xserver when making this call. So, this patch is probably unneeded. But include support anyway. Signed-off-by: Bryce Harrington --- hw/xfree86/os-support/linux/lnx_platform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/xfree86/os-support/linux/lnx_platform.c b/hw/xfree86/os-support/linux/lnx_platform.c index 3386b67..b05719d 100644 --- a/hw/xfree86/os-support/linux/lnx_platform.c +++ b/hw/xfree86/os-support/linux/lnx_platform.c @@ -46,6 +46,9 @@ get_drm_info(struct OdevAttributes *attribs, char *path) } if (err == -EACCES) { if (tries % 500 == 0) LogMessage(X_INFO, "waiting on drm device...\n"); + } if (err == -EAGAIN) { + if (tries % 500 == 0) + LogMessage(X_INFO, "drm device busy...\n"); } else { break; }