From patchwork Sat Oct 20 09:40:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Peres X-Patchwork-Id: 1623051 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 294D8400E9 for ; Sun, 21 Oct 2012 20:06:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC8159EEA3 for ; Sun, 21 Oct 2012 13:06:37 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from iona.labri.fr (iona.labri.fr [147.210.8.143]) by gabe.freedesktop.org (Postfix) with ESMTP id 8210A9E830 for ; Sat, 20 Oct 2012 02:47:19 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by iona.labri.fr (Postfix) with ESMTP id 85B1C523D; Sat, 20 Oct 2012 11:47:16 +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=1350726436; x=1352540836; bh=cddNQyfa4g0lt4 A3A91Gc/cxXC60fxsMO4JYUjJN80Y=; b=YCaOXxfkRXFPRvQHMcYXnjgjSda44B Rob/DcDQmNbK5zDjcC3ZhgzFbBcp/iCNbAhB+eGhy6dhSj8nDn0/fVTkzqrKSh/8 dZxfD0QfPCViH+YJjQoh6L2DUWDsHfNxQfDY8XL+4XvLSOBIr30jXQFP0V6RJN8C ex9LQAPVRX4e0= 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 Ajh-d-Q1iHcI; Sat, 20 Oct 2012 11:47:16 +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 BEFC730AB; Sat, 20 Oct 2012 11:47:15 +0200 (CEST) Message-ID: <50827174.7070109@labri.fr> Date: Sat, 20 Oct 2012 11:40:04 +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: Heinz Diehl Subject: Re: Linux 3.7-rc1 (nouveau_bios_score oops). References: <1724445.dN2yMEzN6d@localhost> <20121020092647.GA3186@fancy-poultry.org> In-Reply-To: <20121020092647.GA3186@fancy-poultry.org> X-Mailman-Approved-At: Sun, 21 Oct 2012 13:04:25 -0700 Cc: =?UTF-8?B?UGF3ZcWCIFNp?= =?UTF-8?B?a29yYQ==?= , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs , marcheu@chromium.org, Linus Torvalds 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 20/10/2012 11:26, Heinz Diehl wrote: > On 20.10.2012, 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? > > Plese see https://lkml.org/lkml/2012/10/19/371 , this is the same > thing going on. Reverting > > Ben Skeggs > drm/nouveau/bios: fix shadowing of ACPI ROMs larger than 64KiB > > fixes the problem. Can you test the attached patch too ? I rebased the previous one I sent on top on 3.7-rc1 as I accidentally used an older version. Martin From f09d58dc23a6e48ed56a1d9bf803f800f0c59e83 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Sat, 20 Oct 2012 11:03:36 +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 619e7e0..519a3b3 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 ret, cnt, i; u8 data[3]; - if (!nouveau_acpi_rom_supported(pdev)) + if (!nouveau_acpi_rom_supported(pdev)) { + bios->data = NULL; return; + } bios->size = 0; if (nouveau_acpi_get_bios_chunk(data, 0, 3) == 3) -- 1.7.12.4