diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-22 10:43:39 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-22 10:43:39 -0700 |
| commit | 55d219394ad6af8e25ff604bcbb49d5a551bd348 (patch) | |
| tree | 0a6c6e83a297e049d7a55abbeaaad61c61d9b53b /src/mga_merge.c | |
| parent | f4ef39d53d5a67942707507814fef4ad466dc909 (diff) | |
Merge PCI-rework support and "classic" PCI interface support into one tree
First pass at merging both trees. So far, this has only been tested
on the PCI-rework build on a PCI G450.
Diffstat (limited to 'src/mga_merge.c')
| -rw-r--r-- | src/mga_merge.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c index 73b085a..141b0c3 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -272,6 +272,9 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) return TRUE; } +#ifndef PCIACCESS + pMga->PciTag = pMga1->PciTag; +#endif pMga->Primary = pMga1->Primary; /* Set pScrn->monitor */ @@ -369,6 +372,12 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) pMga->FbAddress = pMga1->FbAddress; pMga->PciInfo = pMga1->PciInfo; +#ifndef PCIACCESS + pMga->IOAddress = pMga1->IOAddress; + pMga->ILOADAddress = pMga1->ILOADAddress; + pMga->BiosFrom = pMga1->BiosFrom; + pMga->BiosAddress = pMga1->BiosAddress; +#endif /* * Read the BIOS data struct |