From: Ben Skeggs Date: Sun, 4 Mar 2012 07:05:54 +0000 (+1000) Subject: drm/nouveau/bios: attempt acpi rom fetch before pcirom X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~15323^2~61^2~12 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=05a7c15d48ff53b054bc36fc8a2be8bc9b60d9e7;p=mirror_ubuntu-artful-kernel.git drm/nouveau/bios: attempt acpi rom fetch before pcirom There's cards out there with completely messed up PCIROM images that have a perfectly valid signature.. Sigh! Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index e5cbead85e50..773d9cbe19df 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -204,8 +204,8 @@ struct methods { static struct methods shadow_methods[] = { { "PRAMIN", load_vbios_pramin, true }, { "PROM", load_vbios_prom, false }, - { "PCIROM", load_vbios_pci, true }, { "ACPI", load_vbios_acpi, true }, + { "PCIROM", load_vbios_pci, true }, }; #define NUM_SHADOW_METHODS ARRAY_SIZE(shadow_methods)