drm/nouveau/bios: fix shadowing of ACPI ROMs larger than 64KiB

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-10-09 12:21:36 +10:00
parent b9f10852fc
commit 9a334cd0de

View File

@ -185,23 +185,22 @@ static void
nouveau_bios_shadow_acpi(struct nouveau_bios *bios) nouveau_bios_shadow_acpi(struct nouveau_bios *bios)
{ {
struct pci_dev *pdev = nv_device(bios)->pdev; struct pci_dev *pdev = nv_device(bios)->pdev;
int cnt = 65536 / 4096; int ret, cnt, i;
int ret; u8 data[3];
if (!nouveau_acpi_rom_supported(pdev)) if (!nouveau_acpi_rom_supported(pdev))
return; return;
bios->data = kmalloc(65536, GFP_KERNEL);
bios->size = 0; bios->size = 0;
if (!bios->data) if (nouveau_acpi_get_bios_chunk(data, 0, 3) == 3)
return; bios->size = data[2] * 512;
while (cnt--) { bios->data = kmalloc(bios->size, GFP_KERNEL);
ret = nouveau_acpi_get_bios_chunk(bios->data, bios->size, 4096); for (i = 0; bios->data && i < bios->size; i += cnt) {
if (ret != 4096) cnt = min((bios->size - i), (u32)4096);
return; ret = nouveau_acpi_get_bios_chunk(bios->data, i, cnt);
if (ret != cnt)
bios->size += 4096; break;
} }
} }