summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.com>2007-07-11 21:07:47 -0400
committerAlex Deucher <alex@botch2.com>2007-07-11 21:07:47 -0400
commit90692b3a123861ca02100f86b4c80f070fd4196d (patch)
treead66466ff440f11ea8c45b7f8d6266da5f0a1212
parent7832dcd82046238d5accb55468c65241f0edc6d0 (diff)
fix segfault in SavageDoAdjustFrame() on server 1.3
tracked down by Tormod Volden, fixes bug 10934
-rw-r--r--src/savage_driver.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 27cf8ad..1ed7782 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -3911,7 +3911,6 @@ void
SavageDoAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int crtc2)
{
SavagePtr psav = SAVPTR(pScrn);
- DisplayModePtr currentMode = pScrn->currentMode;
int address=0,top=0,left=0,tile_height,tile_size;
TRACE(("SavageDoAdjustFrame(%d,%d,%x)\n", x, y, flags));
@@ -3942,15 +3941,6 @@ SavageDoAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int crtc2)
address += pScrn->fbOffset;
- /*
- * because we align the viewport to the width and height of one tile
- * we should update the locate of frame
- */
- pScrn->frameX0 = left;
- pScrn->frameY0 = top;
- pScrn->frameX1 = left + currentMode->HDisplay - 1;
- pScrn->frameY1 = top + currentMode->VDisplay - 1;
-
if (psav->Chipset == S3_SAVAGE_MX) {
if (!crtc2) {
OUTREG32(PRI_STREAM_FBUF_ADDR0, address & 0xFFFFFFFC);