summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Hellstrom <unichrome@shipmail.org>2005-11-02 21:15:49 +0000
committerThomas Hellstrom <unichrome@shipmail.org>2005-11-02 21:15:49 +0000
commitcf4652283004f823189be7a3a76a14bda31bf71d (patch)
treea2dcf86da685d39b8826cab608e29b2f3d65125b /src
parent4916c2cf7c6893c60a371957cf12d161ff267e9d (diff)
Fix hw cursors overwriting offscreen memory when DRI is not enabled.
Diffstat (limited to 'src')
-rw-r--r--src/via_accel.c1
-rw-r--r--src/via_cursor.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/src/via_accel.c b/src/via_accel.c
index 70137c2..7467f6a 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -409,6 +409,7 @@ VIAInitAccel(ScreenPtr pScreen)
}
if (pVia->hwcursor) {
pVia->FBFreeEnd -= VIA_CURSOR_SIZE;
+ pVia->CursorStart = pVia->FBFreeEnd;
}
VIAInitialize2DEngine(pScrn);
diff --git a/src/via_cursor.c b/src/via_cursor.c
index 835ed8a..29c3f4b 100644
--- a/src/via_cursor.c
+++ b/src/via_cursor.c
@@ -74,10 +74,9 @@ VIAHWCursorInit(ScreenPtr pScreen)
if (!pVia->CursorStart) {
pVia->CursorStart = pVia->FBFreeEnd - VIA_CURSOR_SIZE;
pVia->FBFreeEnd -= VIA_CURSOR_SIZE;
-
- /* Set cursor location in frame buffer. */
- VIASETREG(VIA_REG_CURSOR_MODE, pVia->CursorStart);
}
+ /* Set cursor location in frame buffer. */
+ VIASETREG(VIA_REG_CURSOR_MODE, pVia->CursorStart);
return xf86InitCursor(pScreen, infoPtr);
}