diff mbox

Linux 3.7-rc1 (nouveau_bios_score oops).

Message ID 5081D72C.2080309@labri.fr (mailing list archive)
State New, archived
Headers show

Commit Message

Martin Peres Oct. 19, 2012, 10:41 p.m. UTC 
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
diff mbox

Patch

From ea15dc1cf87236da78e8e88ecc3864ffab006ae0 Mon Sep 17 00:00:00 2001
From: Martin Peres <martin.peres@labri.fr>
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 <pawel.sikora@agmk.net>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
---
 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