From patchwork Tue Mar 30 15:13:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 48978 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E2CC2B7C48 for ; Wed, 31 Mar 2010 02:12:44 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Nwd7P-0001iG-77; Tue, 30 Mar 2010 16:12:39 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Nwd7O-0001iB-2y for kernel-team@lists.ubuntu.com; Tue, 30 Mar 2010 16:12:38 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Nwd7O-0006EG-1e; Tue, 30 Mar 2010 16:12:38 +0100 Received: from [70.114.236.114] (helo=hungry.local) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Nwd7N-0000hg-O2; Tue, 30 Mar 2010 16:12:38 +0100 Date: Tue, 30 Mar 2010 10:13:35 -0500 (CDT) From: manoj.iyer@canonical.com To: Stefan Bader Subject: Re: [LUCID BUG# 507148] [PATCH 2/2] drm/radeon/kms: don't print error on -ERESTARTSYS. In-Reply-To: <4BB1BC61.8060806@canonical.com> Message-ID: References: <4BB1BC61.8060806@canonical.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Cc: Ubuntu Kernel Team X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Updated patch with information requested. The following changes since commit c2b3a0b3ccb3b114c7e22117cb1fd23f63068bea: JosephChan@via.com.tw (1): (pre-stable) pata_via: Add VIA VX900 support are available in the git repository at: git://kernel.ubuntu.com/manjo/ubuntu-lucid.git lp507148upstream Dave Airlie (2): drm/radeon/bo: add some fallback placements for VRAM only objects. drm/radeon/kms: don't print error on -ERESTARTSYS. drivers/gpu/drm/radeon/radeon.h | 2 ++ drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- drivers/gpu/drm/radeon/radeon_object.c | 10 +++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) From 78f0533f3905dd1b986c58b595185fd63eb6dd93 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 19 Mar 2010 10:33:44 +1000 Subject: [PATCH 2/2] drm/radeon/kms: don't print error on -ERESTARTSYS. We can get this if the user moves the mouse when we are waiting to move some stuff around in the validate. Don't fail. Cc: stable@kernel.org Signed-off-by: Dave Airlie (cherry picked from commit aa98c7cc9153b07d652257149f158c953d15de02) Signed-off-by: Manoj Iyer BugLink: http://launchpad.net/bugs/507148 Cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git Acked-by: Stefan Bader Acked-by: Andy Whitcroft --- drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index e9d0850..de5b7b4 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -246,7 +246,8 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) } r = radeon_cs_parser_relocs(&parser); if (r) { - DRM_ERROR("Failed to parse relocation !\n"); + if (r != -ERESTARTSYS) + DRM_ERROR("Failed to parse relocation %d!\n", r); radeon_cs_parser_fini(&parser, r); mutex_unlock(&rdev->cs_mutex); return r;