UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch 

On nv50 it became impossible to attempt a PCI ROM shadow of the VBIOS,
which will break some setups.

This patch also removes the different ordering of shadow methods for
pre-nv50 chipsets.  The reason for the different ordering was paranoia,
but it should hopefully be OK to try shadowing PRAMIN first.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Ben Skeggs 2010-07-12 13:15:44 +10:00 committed by Dave Airlie
parent 42f14c4b45
commit 14d7ec11d1
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/gpu/drm/nouveau/nouveau_bios.c
View File

@ -203,36 +203,26 @@ struct methods {
const bool rw; const bool rw;
}; };
static struct methods nv04_methods[] = { static struct methods shadow_methods[] = {
{ "PROM", load_vbios_prom, false },
{ "PRAMIN", load_vbios_pramin, true }, { "PRAMIN", load_vbios_pramin, true },
{ "PROM", load_vbios_prom, false },
{ "PCIROM", load_vbios_pci, true }, { "PCIROM", load_vbios_pci, true },
};
static struct methods nv50_methods[] = {
{ "ACPI", load_vbios_acpi, true }, { "ACPI", load_vbios_acpi, true },
{ "PRAMIN", load_vbios_pramin, true },
{ "PROM", load_vbios_prom, false },
{ "PCIROM", load_vbios_pci, true },
}; };
#define METHODCNT 3
static bool NVShadowVBIOS(struct drm_device *dev, uint8_t *data) static bool NVShadowVBIOS(struct drm_device *dev, uint8_t *data)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; const int nr_methods = ARRAY_SIZE(shadow_methods);
struct methods *methods; struct methods *methods = shadow_methods;
int i;
int testscore = 3; int testscore = 3;
int scores[METHODCNT]; int scores[nr_methods], i;
if (nouveau_vbios) { if (nouveau_vbios) {
methods = nv04_methods; for (i = 0; i < nr_methods; i++)
for (i = 0; i < METHODCNT; i++)
if (!strcasecmp(nouveau_vbios, methods[i].desc)) if (!strcasecmp(nouveau_vbios, methods[i].desc))
break; break;
if (i < METHODCNT) { if (i < nr_methods) {
NV_INFO(dev, "Attempting to use BIOS image from %s\n", NV_INFO(dev, "Attempting to use BIOS image from %s\n",
methods[i].desc); methods[i].desc);
@ -244,12 +234,7 @@ static bool NVShadowVBIOS(struct drm_device *dev, uint8_t *data)
NV_ERROR(dev, "VBIOS source \'%s\' invalid\n", nouveau_vbios); NV_ERROR(dev, "VBIOS source \'%s\' invalid\n", nouveau_vbios);
} }
if (dev_priv->card_type < NV_50) for (i = 0; i < nr_methods; i++) {
methods = nv04_methods;
else
methods = nv50_methods;
for (i = 0; i < METHODCNT; i++) {
NV_TRACE(dev, "Attempting to load BIOS image from %s\n", NV_TRACE(dev, "Attempting to load BIOS image from %s\n",
methods[i].desc); methods[i].desc);
data[0] = data[1] = 0; /* avoid reuse of previous image */ data[0] = data[1] = 0; /* avoid reuse of previous image */
@ -260,7 +245,7 @@ static bool NVShadowVBIOS(struct drm_device *dev, uint8_t *data)
} }
while (--testscore > 0) { while (--testscore > 0) {
for (i = 0; i < METHODCNT; i++) { for (i = 0; i < nr_methods; i++) {
if (scores[i] == testscore) { if (scores[i] == testscore) {
NV_TRACE(dev, "Using BIOS image from %s\n", NV_TRACE(dev, "Using BIOS image from %s\n",
methods[i].desc); methods[i].desc);