From patchwork Tue Apr 19 21:52:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marcin_=C5=9Alusarz?= X-Patchwork-Id: 720321 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 p3JLsmqK003728 for ; Tue, 19 Apr 2011 21:55:09 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48CAD9E828 for ; Tue, 19 Apr 2011 14:54:47 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id CF5329E710; Tue, 19 Apr 2011 14:54:37 -0700 (PDT) Received: by fxm14 with SMTP id 14so143499fxm.36 for ; Tue, 19 Apr 2011 14:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=W733995of6OdbmI9jVn1SHZcjqKYnNBjWhv6niOv1ss=; b=wnOW5T1c7c1F7hYWL7rEi5MsLLyUJadB5YLFMI3u6K7qzPN2osv/WvzDZj68wuaL+K HCO6AKSb+IGPGGyBz5WL5Fm6VfgbFGmGIM9ERuG3Q4CAs8w808b1UnDK6U0sykJ943FR lIuAuEpTp8sKQj7KMCQKk8Wpg0qbX2Vuva8ng= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=qLZeNLcI3dcD5dUjnSfcT+KurnDr3ABIjF2BKLL+L+WPCksxfbq5yHesF1UA8CaUeQ uZO2vtJrmJDc7jMmtgXHApdAeUdIML4kwKftWyujdYNI4LKQnh96vqCllExkJg8RXLo/ 3KBmXcjQkmuP3J3IyisEs2ZAsaVQd1msZGYK8= Received: by 10.223.14.137 with SMTP id g9mr1330213faa.1.1303250076950; Tue, 19 Apr 2011 14:54:36 -0700 (PDT) Received: from joi.lan (adug202.neoplus.adsl.tpnet.pl [79.185.244.202]) by mx.google.com with ESMTPS id t2sm87051faa.47.2011.04.19.14.54.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 19 Apr 2011 14:54:36 -0700 (PDT) Date: Tue, 19 Apr 2011 23:52:42 +0200 From: Marcin Slusarz To: Ben Skeggs Subject: [PATCH 2/2] drm/nouveau: fix allocation of notifier object Message-ID: <20110419215242.GC2965@joi.lan> References: <20110415061136.GA21979@isilmar-3.linta.de> <4DAA1453.5000604@nigelcunningham.com.au> <20110416235028.GA6096@taurine.csclub.uwaterloo.ca> <20110417151204.GA24519@taurine.csclub.uwaterloo.ca> <20110417154557.GA2871@joi.lan> <20110417162427.GB25242@taurine.csclub.uwaterloo.ca> <20110417164920.GA2626@joi.lan> <20110418200204.GA2522@joi.lan> <20110419214747.GA2965@joi.lan> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110419214747.GA2965@joi.lan> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: nouveau@lists.freedesktop.org, Nick Piggin , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Kyle Spaans , Dominik Brodowski , Nigel Cunningham , airlied@redhat.com, maciej.rutecki@gmail.com, Linus Torvalds , mjg@redhat.com 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: , 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 21:55:10 +0000 (UTC) Commit 73412c3854c877e5f37ad944ee8977addde4d35a ("drm/nouveau: allocate kernel's notifier object at end of block") intended to align end of notifier block to page boundary, but start of block was miscalculated to be off by -16 bytes. Fix it. Signed-off-by: Marcin Slusarz Cc: Ben Skeggs --- drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index ce38e97..568caed 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c @@ -83,7 +83,7 @@ nouveau_dma_init(struct nouveau_channel *chan) return ret; /* NV_MEMORY_TO_MEMORY_FORMAT requires a notifier object */ - ret = nouveau_notifier_alloc(chan, NvNotify0, 32, 0xfd0, 0x1000, + ret = nouveau_notifier_alloc(chan, NvNotify0, 32, 0xfe0, 0x1000, &chan->m2mf_ntfy); if (ret) return ret;