Messages in this thread Patch in this message | | | Date | Sat, 20 Oct 2012 11:40:04 +0200 | From | Martin Peres <> | Subject | Re: Linux 3.7-rc1 (nouveau_bios_score oops). |
| |
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 <bskeggs@redhat.com> > 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 <martin.peres@labri.fr> 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 <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 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
| |