diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-02 01:03:50 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-02 01:03:50 +0000 |
| commit | 07373669514b104a11fb1b4ed5214f3764c83a2f (patch) | |
| tree | 79180b5c1bb8ee011b4bf7a829f57ae55f832c59 /src/mga_storm.c | |
| parent | 88ece3c37c4ed529686b6cdea1bf9b6eed8fceea (diff) | |
Bug #6328: Add support for Matrox G200SE chips. (Matrox)
Diffstat (limited to 'src/mga_storm.c')
| -rw-r--r-- | src/mga_storm.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/mga_storm.c b/src/mga_storm.c index 366bddb..187aa93 100644 --- a/src/mga_storm.c +++ b/src/mga_storm.c @@ -645,6 +645,11 @@ Bool mgaAccelInit( ScreenPtr pScreen ) TRANSC_SOLID_FILL | USE_RECTS_FOR_LINES; break; + case PCI_CHIP_MGAG200_SE_A_PCI: + case PCI_CHIP_MGAG200_SE_B_PCI: + doRender = FALSE; + pMga->AccelFlags = TRANSC_SOLID_FILL | TWO_PASS_COLOR_EXPAND; + break; case PCI_CHIP_MGAG400: case PCI_CHIP_MGAG550: if(pMga->SecondCrtc == TRUE) { @@ -853,8 +858,17 @@ Bool mgaAccelInit( ScreenPtr pScreen ) pMga->MaxFastBlitY = maxFastBlitMem / (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8); } - maxlines = (min(pMga->FbUsableSize, 16*1024*1024)) / - (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8); + switch (pMga->Chipset) { + case PCI_CHIP_MGAG200_SE_A_PCI: + case PCI_CHIP_MGAG200_SE_B_PCI: + maxlines = (min(pMga->FbUsableSize, 1*1024*1024)) / + (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8); + break; + default: + maxlines = (min(pMga->FbUsableSize, 16*1024*1024)) / + (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8); + break; + } #ifdef XF86DRI if ( pMga->directRenderingEnabled ) { @@ -1190,6 +1204,8 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn ) case PCI_CHIP_MGAG400: case PCI_CHIP_MGAG200: case PCI_CHIP_MGAG200_PCI: + case PCI_CHIP_MGAG200_SE_A_PCI: + case PCI_CHIP_MGAG200_SE_B_PCI: pMga->SrcOrg = 0; OUTREG(MGAREG_SRCORG, pMga->realSrcOrg); OUTREG(MGAREG_DSTORG, pMga->DstOrg); |