diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-08-03 17:58:56 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-08-03 18:29:12 -0700 |
| commit | a79aa0d7b27b0b9b032472776d7dda410fd66a98 (patch) | |
| tree | b75521103e34499e72771cd1219ccdc24fca38b2 /src/i830_cursor.c | |
| parent | 760021e3983f7783900075b8c9603bd4fbe7e0a2 (diff) | |
| parent | f9e94c17c55e4c75802d8574c908744e286e7843 (diff) | |
Merge branch 'broadwater-video-rehash' into broadwater
Conflicts:
src/Makefile.am
src/common.h
src/i810_driver.c
src/i810_reg.h
src/i830.h
src/i830_accel.c
src/i830_cursor.c
src/i830_dri.c
src/i830_dri.h
src/i830_driver.c
src/i830_memory.c
src/i830_rotate.c
src/i830_video.c
Diffstat (limited to 'src/i830_cursor.c')
| -rw-r--r-- | src/i830_cursor.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/i830_cursor.c b/src/i830_cursor.c index 9f22a664..c835caed 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -376,12 +376,10 @@ I830SetCursorPosition(ScrnInfoPtr pScrn, int x, int y) { I830Ptr pI830 = I830PTR(pScrn); CARD32 temp = 0; + static Bool outsideViewport = FALSE; Bool hide = FALSE, show = FALSE; int oldx = x, oldy = y; int hotspotx = 0, hotspoty = 0; -#if 0 - static Bool outsideViewport = FALSE; -#endif oldx += pScrn->frameX0; /* undo what xf86HWCurs did */ oldy += pScrn->frameY0; @@ -551,7 +549,7 @@ I830ShowCursor(ScrnInfoPtr pScrn) temp &= ~(CURSOR_FORMAT_MASK | CURSOR_GAMMA_ENABLE); temp |= CURSOR_ENABLE; if (pI830->CursorIsARGB) - temp |= CURSOR_FORMAT_ARGB | CURSOR_GAMMA_ENABLE; + temp |= CURSOR_FORMAT_ARGB; else temp |= CURSOR_FORMAT_3C; OUTREG(CURSOR_CONTROL, temp); |