diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-01-27 03:50:46 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-01-27 03:50:46 +0000 |
| commit | cb406770d1b88ecda3e7dba14f21b2cf90449a93 (patch) | |
| tree | 092ddf47808554e15aa48318989e50416583ead9 /src/savage_accel.c | |
| parent | d62d010ca8590d99d4150f7b00999e619a6aaac3 (diff) | |
- Fix tiled framebuffer setup on Savage3D (Alex Deucher)
- Disable building the Savage DRI driver.
Diffstat (limited to 'src/savage_accel.c')
| -rw-r--r-- | src/savage_accel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/savage_accel.c b/src/savage_accel.c index bce0b6c..251076f 100644 --- a/src/savage_accel.c +++ b/src/savage_accel.c @@ -426,7 +426,7 @@ SavageSetGBD(ScrnInfoPtr pScrn) psav->bTiled = TRUE; psav->lDelta = ((psav->lDelta + 127) >> 7) << 7; - if (psav->Chipset == S3_SAVAGE_MX) + if (S3_SAVAGE3D_SERIES(psav->Chipset)) psav->ulAperturePitch = 0x2000; else if (psav->Chipset == S3_SAVAGE2000) psav->ulAperturePitch = GetTileAperturePitch2000(pScrn->virtualX, @@ -773,13 +773,13 @@ void SavageSetGBD_3D(ScrnInfoPtr pScrn) else if (pScrn->bitsPerPixel == 16) { psav->GlobalBD.bd1.HighPart.ResBWTile = tile16; /* 16 bpp/destination tiling format */ - ulTmp = (((pScrn->virtualX + 0x3F) & 0x0000FFC0) >> 6) << 20; + ulTmp = (((pScrn->virtualX + 0x3F) & 0x0000FFC0) >> 6) << 24; OUTREG32(TILED_SURFACE_REGISTER_0,ulTmp | TILED_SURF_BPP16); } else if (pScrn->bitsPerPixel == 32) { psav->GlobalBD.bd1.HighPart.ResBWTile = tile32; /* 32 bpp/destination tiling format */ - ulTmp = ( ((pScrn->virtualX + 0x1F) & 0x0000FFE0) >> 5) << 20; + ulTmp = ( ((pScrn->virtualX + 0x1F) & 0x0000FFE0) >> 5) << 24; OUTREG32(TILED_SURFACE_REGISTER_0,ulTmp | TILED_SURF_BPP32); } |