diff options
| author | James Cloos <cloos@jhcloos.com> | 2007-09-03 06:07:32 -0400 |
|---|---|---|
| committer | James Cloos <cloos@jhcloos.com> | 2007-09-03 06:07:32 -0400 |
| commit | 6fde3fd6d34e7252ee16422b19896d71b1622039 (patch) | |
| tree | f14ab2b9dd93d9097d5f2c8a4085ee2b81a6f7fc /src/mga_storm.c | |
| parent | 4bfc1e1ea11604e3af150a4228663cb1cb1bf9f3 (diff) | |
| parent | 923176f5aad777b4023003a457bb77da21373389 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-mga
Diffstat (limited to 'src/mga_storm.c')
| -rw-r--r-- | src/mga_storm.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/src/mga_storm.c b/src/mga_storm.c index 67338d9..dfdebeb 100644 --- a/src/mga_storm.c +++ b/src/mga_storm.c @@ -613,37 +613,10 @@ Bool mgaAccelInit( ScreenPtr pScreen ) pMga->MaxFastBlitY = 0; pMga->MaxBlitDWORDS = 0x40000 >> 5; - switch (pMga->Chipset) { - case PCI_CHIP_MGA2064: - pMga->AccelFlags = BLK_OPAQUE_EXPANSION | FASTBLT_BUG; - break; - case PCI_CHIP_MGA2164: - case PCI_CHIP_MGA2164_AGP: - pMga->AccelFlags = BLK_OPAQUE_EXPANSION | - TRANSC_SOLID_FILL | - USE_RECTS_FOR_LINES; - break; - case PCI_CHIP_MGAG200_SE_A_PCI: - case PCI_CHIP_MGAG200_SE_B_PCI: - case PCI_CHIP_MGAG400: - case PCI_CHIP_MGAG550: - case PCI_CHIP_MGAG200: - case PCI_CHIP_MGAG200_PCI: - pMga->AccelFlags = TRANSC_SOLID_FILL | - TWO_PASS_COLOR_EXPAND; - break; - case PCI_CHIP_MGA1064: - pMga->AccelFlags = 0; - break; - case PCI_CHIP_MGAG100: - case PCI_CHIP_MGAG100_PCI: - default: - pMga->AccelFlags = MGA_NO_PLANEMASK; - break; - } - /* all should be able to use this now with the bug fixes */ - pMga->AccelFlags |= USE_LINEAR_EXPANSION; + /* Set initial acceleration flags. + */ + pMga->AccelFlags = pMga->chip_attribs->accel_flags; if ((pMga->FbMapSize > 8*1024*1024) && (pScrn->depth == 8)) { pMga->AccelFlags |= LARGE_ADDRESSES; |