diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-10-14 14:36:06 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2010-10-14 14:36:06 -0400 |
| commit | 636c3c88e7e9cb30010fe1731cd7356849f3f172 (patch) | |
| tree | 9095ecf8373ce0652ab1b65a70b14ef1274b1427 | |
| parent | 0bd44fad450843b7f1c35c70ab356a2b250d107d (diff) | |
Don't allow the config file to override BIOS location
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/mga_driver.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c index 72e7acc..37bf847 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -1779,23 +1779,16 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) #ifndef XSERVER_LIBPCIACCESS /* * Find the BIOS base. Get it from the PCI config if possible. Otherwise - * use the VGA default. Allow the config file to override this. + * use the VGA default. */ - pMga->BiosFrom = X_NONE; - if (pMga->device->BiosBase != 0) { - /* XXX This isn't used */ - pMga->BiosAddress = pMga->device->BiosBase; - pMga->BiosFrom = X_CONFIG; - } else { - /* details: rombase sdk pp 4-15 */ - if (pMga->PciInfo->biosBase != 0) { - pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000; - pMga->BiosFrom = X_PROBED; - } else if (pMga->Primary) { - pMga->BiosAddress = 0xc0000; - pMga->BiosFrom = X_DEFAULT; - } + /* details: rombase sdk pp 4-15 */ + if (pMga->PciInfo->biosBase != 0) { + pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000; + pMga->BiosFrom = X_PROBED; + } else if (pMga->Primary) { + pMga->BiosAddress = 0xc0000; + pMga->BiosFrom = X_DEFAULT; } if (pMga->BiosAddress) { xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n", |