From patchwork Wed Feb 12 01:41:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 3639801 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D144E9F334 for ; Wed, 12 Feb 2014 18:05:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A5DF20160 for ; Wed, 12 Feb 2014 18:05:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 338102015D for ; Wed, 12 Feb 2014 18:05:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2FDD2FAF1A; Wed, 12 Feb 2014 10:05:15 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 78C25FAAA2; Tue, 11 Feb 2014 17:39:45 -0800 (PST) Received: by mail-wi0-f173.google.com with SMTP id hn9so5842700wib.12 for ; Tue, 11 Feb 2014 17:39:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PaekqnM3DglxKi2+6WG/qPajlkN3ROwmwYj4B1k51g0=; b=IFbg0ckthO1tYyX1KtZvTGfnOaBltomj2iM6KVQRV2SYpWsLA4KHKVYY1hJNe7pWFP 6sLSOh2eKfIodUO+exP7+ahCRqTyxcQRTbrREbMNy9DUvUvpS6ZxVaLiMD/hPk8QBhXF HY5sEIw8w8W07vtDf6TmICMl1jB6umaTSNmv2VswcB4stq1nIfgOVrKiFICBBkPiSocU gQamZMvGZDgbeFmwqHoiBoIdVSnsROulw+cm9686ystEH2+3BjrqXj2+sUpPCH7f9uzX 9vUAq9Ox01BkbZpWtv83wMIjhZtt1KMXz1zVNaCinY/8NvMg7Q9GaC0YUi9lP1HQwGOR 2i9w== X-Received: by 10.194.108.162 with SMTP id hl2mr65560wjb.84.1392169181353; Tue, 11 Feb 2014 17:39:41 -0800 (PST) Received: from localhost.localdomain (cpc20-stap10-2-0-cust563.12-2.cable.virginm.net. [82.20.130.52]) by mx.google.com with ESMTPSA id d6sm2019719wic.9.2014.02.11.17.39.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Feb 2014 17:39:40 -0800 (PST) From: Emil Velikov To: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/nouveau/fb: use correct ram oclass for nv1a hardware Date: Wed, 12 Feb 2014 01:41:42 +0000 Message-Id: <1392169302-8155-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 1.8.5.4 X-Mailman-Approved-At: Wed, 12 Feb 2014 10:05:13 -0800 Cc: Emil Velikov , Ben Skeggs , stable@vger.kernel.org#3.13+ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 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@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 8613e7314ac254fdd67ed46192f021d76141e4c9 Author: Ben Skeggs Date: Mon Oct 21 08:50:25 2013 +1000 drm/nouveau/fb: remove ram oclass argument from base fb constructor Introduced a unfortunate regression by using nv10 ram oclass for nv1a hardware, causing corruption and eventually system lockup. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74866 Reported-by: John F. Godfrey Signed-off-by: Emil Velikov Cc: stable@vger.kernel.org # 3.13+ --- drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c index 9159a5c..265d125 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c @@ -36,7 +36,7 @@ nv1a_fb_oclass = &(struct nv04_fb_impl) { .fini = _nouveau_fb_fini, }, .base.memtype = nv04_fb_memtype_valid, - .base.ram = &nv10_ram_oclass, + .base.ram = &nv1a_ram_oclass, .tile.regions = 8, .tile.init = nv10_fb_tile_init, .tile.fini = nv10_fb_tile_fini,