From patchwork Fri Oct 19 22:41:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Peres X-Patchwork-Id: 1623041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id BDCD5DFFF1 for ; Sun, 21 Oct 2012 20:05:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7CCD29EEA1 for ; Sun, 21 Oct 2012 13:05:47 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 550 seconds by postgrey-1.32 at gabe; Sat, 20 Oct 2012 00:58:12 CEST Received: from iona.labri.fr (iona.labri.fr [147.210.8.143]) by gabe.freedesktop.org (Postfix) with ESMTP id E15D39ECA9 for ; Fri, 19 Oct 2012 15:58:12 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by iona.labri.fr (Postfix) with ESMTP id 1B5704C29; Sat, 20 Oct 2012 00:49:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=labri.fr; h= content-type:content-type:in-reply-to:references:subject:subject :mime-version:user-agent:from:from:date:date:message-id:received :received; s=mail; t=1350686939; x=1352501339; bh=i9uQ+Bu2Dt1qUE YdNCvX5xAtG9rtJpd6H4v+cAhzlWk=; b=OdUTHLIKxTPdf6DC5rmGGoT8DchMnW DqT4db1JK0a7NA6ooK/nwl5KI6pgUZMelBOepkTSkeIsXE+8dYh2JYLuw9RXCJe/ Wl4q6rdC0s2janUnyIfjNqEy7W/siLFvuFbbhrjXsQXLaYcIW5C+HQwvFibjNV0l vnKaKvlHMqP8g= X-Virus-Scanned: amavisd-new at labri.fr Received: from iona.labri.fr ([127.0.0.1]) by localhost (iona.labri.fr [127.0.0.1]) (amavisd-new, port 10027) with LMTP id ckMlR-UUUY-j; Sat, 20 Oct 2012 00:48:59 +0200 (CEST) Received: from [192.168.1.101] (unknown [89.159.199.232]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by iona.labri.fr (Postfix) with ESMTPSA id A24B71040; Sat, 20 Oct 2012 00:48:59 +0200 (CEST) Message-ID: <5081D72C.2080309@labri.fr> Date: Sat, 20 Oct 2012 00:41:48 +0200 From: Martin Peres User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121012 Thunderbird/16.0.1 MIME-Version: 1.0 To: Linus Torvalds Subject: Re: Linux 3.7-rc1 (nouveau_bios_score oops). References: <1724445.dN2yMEzN6d@localhost> In-Reply-To: X-Mailman-Approved-At: Sun, 21 Oct 2012 13:04:25 -0700 Cc: =?UTF-8?B?UGF3ZcWCIFNpa29yYQ==?= , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs , marcheu@chromium.org 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: , 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 On 10/19/12 23:25, Linus Torvalds wrote: > Added more appropriate people to this. Added both i915 and nouveau > people, since apparently that fine piece of hardware has both. > > Guys, any ideas? > > Pawe?, could you perhaps get a photo of the oops and post it > somewhere? I'm assuming the oops happens early during boot and you > never get a usable machine with dmesg - but if you do, then please do > post the whole dmesg too. > > Linus Hi Linus, You must have missed the oops that was attached to the mail: http://www.spinics.net/lists/kernel/msg1420355.html Pawe?, could you try the attached patch please ? Martin From ea15dc1cf87236da78e8e88ecc3864ffab006ae0 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Sat, 20 Oct 2012 00:08:15 +0200 Subject: [PATCH] drm/nouveau/bios: improve error handling when reading the vbios from ACPI Reported-by: Pawel Sikora Signed-off-by: Martin Peres --- drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c index 2fbb6df..e31d8fc 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c @@ -188,8 +188,10 @@ nouveau_bios_shadow_acpi(struct nouveau_bios *bios) int cnt = 65536 / 4096; int ret; - if (!nouveau_acpi_rom_supported(pdev)) + if (!nouveau_acpi_rom_supported(pdev)) { + bios->data = NULL; return; + } bios->data = kmalloc(65536, GFP_KERNEL); bios->size = 0; -- 1.7.12.3