diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-12-11 15:06:03 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-12-11 15:06:03 -0800 |
| commit | d0e03622811fd94c830c0b5233ff505392c0d331 (patch) | |
| tree | d52e44dc616a677e9f2901d36f99e0ed579cf87e /src/mga_driver.c | |
| parent | 8fee907cac7e5924630e3648bfb72ad9bd021ea8 (diff) | |
| parent | 1dd6e6995d7a37338dce6ee5b1aa4ee9dd848e1d (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga into pci-rework
Conflicts:
src/mga_macros.h
Diffstat (limited to 'src/mga_driver.c')
| -rw-r--r-- | src/mga_driver.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c index fbaab0c..8fa36ff 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -829,9 +829,7 @@ MGACountRam(ScrnInfoPtr pScrn) OUTREG8(MGAREG_CRTCEXT_DATA, tmp | 0x80); /* apparently the G200SE doesn't have a BIOS to read */ - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { - + if (pMga->is_G200SE) { CARD32 MemoryAt0, MemoryAt1, Offset; CARD32 FirstMemoryVal1, FirstMemoryVal2; CARD32 SecondMemoryVal1, SecondMemoryVal2; @@ -1282,6 +1280,12 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) } else { xf86ErrorF("\n"); } + + pMga->is_Gx50 = ((pMga->Chipset == PCI_CHIP_MGAG400) && (pMga->ChipRev >= 0x80)) + || (pMga->Chipset == PCI_CHIP_MGAG550); + pMga->is_G200SE = (pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) + || (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI); + #ifdef USEMGAHAL if (pMga->chip_attribs->HAL_chipset) { Bool loadHal = TRUE; @@ -2968,8 +2972,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pMga = MGAPTR(pScrn); MGAdac = &pMga->Dac; - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { VRTemp = pScrn->videoRam; FBTemp = pMga->FbMapSize; pScrn->videoRam = 4096; @@ -3053,8 +3056,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ); /* MGA_HAL */ #endif } - if ((pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) || - (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI)) { + if (pMga->is_G200SE) { pScrn->videoRam = VRTemp; pMga->FbMapSize = FBTemp; } |