diff options
| author | David Airlie <airlied@asimov.stargames.com.au> | 2007-01-23 15:20:11 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-23 15:04:54 +1100 |
| commit | 9149e763865598c307cbefc753ff6ebdeeaf32ae (patch) | |
| tree | 3e6493e86dc269b0b687cef6fe0493fb1b2d8d68 /src/radeon_cursor.c | |
| parent | 2a13a3b641d9acf4f50472e1c8ba07633c3b78d6 (diff) | |
radeon: fixup problem with cursor not going off
Also fixup secondary dac detect to return unknown for now
Diffstat (limited to 'src/radeon_cursor.c')
| -rw-r--r-- | src/radeon_cursor.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index 79d4a23..ac6f358 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -114,11 +114,12 @@ RADEONCrtcCursor(xf86CrtcPtr crtc, Bool force) Bool show; unsigned char *RADEONMMIO = info->MMIO; CARD32 save1 = 0, save2 = 0; - if (!crtc->enabled) - return; + + if (!crtc->enabled && !crtc->cursorShown) + return; - show = crtc->cursorInRange; + show = crtc->cursorInRange && crtc->enabled; if (show && (force || !crtc->cursorShown)) { if (crtc_id == 0) @@ -205,7 +206,7 @@ RADEONRandrSetCursorPosition(ScrnInfoPtr pScrn, int x, int y) int thisx = x - crtc->x; int thisy = y - crtc->y; - if (!crtc->enabled) + if (!crtc->enabled && !crtc->cursorShown) continue; /* |