Commit de2b8b8b authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/bios: attempt to fetch entire acpi rom image in one shot

v2: fdo#55948 - the _ROM method silently truncates size to 4KiB, perform
    a checksum test and fall back to slow _ROM access on failure.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 28164fda
...@@ -210,11 +210,19 @@ nouveau_bios_shadow_acpi(struct nouveau_bios *bios) ...@@ -210,11 +210,19 @@ nouveau_bios_shadow_acpi(struct nouveau_bios *bios)
return; return;
bios->data = kmalloc(bios->size, GFP_KERNEL); bios->data = kmalloc(bios->size, GFP_KERNEL);
for (i = 0; bios->data && i < bios->size; i += cnt) { if (bios->data) {
cnt = min((bios->size - i), (u32)4096); /* disobey the acpi spec - much faster on at least w530 ... */
ret = nouveau_acpi_get_bios_chunk(bios->data, i, cnt); ret = nouveau_acpi_get_bios_chunk(bios->data, 0, bios->size);
if (ret != cnt) if (ret != bios->size ||
break; nvbios_checksum(bios->data, bios->size)) {
/* ... that didn't work, ok, i'll be good now */
for (i = 0; i < bios->size; i += cnt) {
cnt = min((bios->size - i), (u32)4096);
ret = nouveau_acpi_get_bios_chunk(bios->data, i, cnt);
if (ret != cnt)
break;
}
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment