From patchwork Wed Apr 27 05:34:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 735381 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3R6ukBc024698 for ; Wed, 27 Apr 2011 06:57:09 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D6B29EFEE for ; Tue, 26 Apr 2011 23:56:46 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 27 Apr 2011 06:57:16 +0000 (UTC) X-Greylist: delayed 1593 seconds by postgrey-1.31 at gabe; Tue, 26 Apr 2011 23:00:45 PDT Received: from hall.aurel32.net (hall.aurel32.net [88.191.126.93]) by gabe.freedesktop.org (Postfix) with ESMTP id AE6AE9E765 for ; Tue, 26 Apr 2011 23:00:45 -0700 (PDT) Received: from [2001:470:d4ed:0:5e26:aff:fe2b:6f5b] (helo=volta.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1QExO5-0008UO-6x; Wed, 27 Apr 2011 07:34:09 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.72) (envelope-from ) id 1QExO4-0001zO-3j; Wed, 27 Apr 2011 07:34:08 +0200 From: Aurelien Jarno To: David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/nouveau: Use pci_dma_mapping_error() Date: Wed, 27 Apr 2011 07:34:03 +0200 Message-Id: <1303882443-7613-2-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1303882443-7613-1-git-send-email-aurelien@aurel32.net> References: <1303882443-7613-1-git-send-email-aurelien@aurel32.net> X-Mailman-Approved-At: Tue, 26 Apr 2011 23:56:37 -0700 Cc: linux-kernel@vger.kernel.org, Aurelien Jarno X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org ... instead of comparing with DMA_ERROR_CODE, which will only work on powerpc/sparc/x86. Signed-off-by: Aurelien Jarno --- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index 4bce801..b038de9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -42,7 +42,8 @@ nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages, nvbe->nr_pages = 0; while (num_pages--) { - if (dma_addrs[nvbe->nr_pages] != DMA_ERROR_CODE) { + if (pci_dma_mapping_error(dev->pdev, + dma_addrs[nvbe->nr_pages])) { nvbe->pages[nvbe->nr_pages] = dma_addrs[nvbe->nr_pages]; nvbe->ttm_alloced[nvbe->nr_pages] = true;