diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-08 10:23:29 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-08-08 10:23:29 +0100 |
| commit | 633a683a4adcb9a44a54519fd7ff66aab2d12f97 (patch) | |
| tree | 3a2804af9aa600a8c8b4db8f6398338c378504bc /src/i830_cursor.c | |
| parent | e71108f1e05b7a8d8edd174eb64edd6cccacbcdc (diff) | |
Ensure palette is updated in mergedfb & clone modes
Diffstat (limited to 'src/i830_cursor.c')
| -rw-r--r-- | src/i830_cursor.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/i830_cursor.c b/src/i830_cursor.c index 1d7808b6..1657f7c4 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -116,9 +116,10 @@ I830InitHWCursor(ScrnInfoPtr pScrn) temp = INREG(CURSOR_CONTROL); temp &= ~(CURSOR_FORMAT_MASK | CURSOR_GAMMA_ENABLE | CURSOR_ENABLE | CURSOR_STRIDE_MASK); - temp |= (CURSOR_FORMAT_3C); if (pI830->CursorIsARGB) - temp |= CURSOR_GAMMA_ENABLE; + temp |= CURSOR_FORMAT_ARGB | CURSOR_GAMMA_ENABLE; + else + temp |= CURSOR_FORMAT_3C; /* This initialises the format and leave the cursor disabled. */ OUTREG(CURSOR_CONTROL, temp); /* Need to set address and size after disabling. */ @@ -588,7 +589,7 @@ I830ShowCursor(ScrnInfoPtr pScrn) temp = INREG(CURSOR_A_CONTROL); temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT | MCURSOR_GAMMA_ENABLE); if (pI830->CursorIsARGB) - temp |= CURSOR_MODE_64_ARGB_AX; + temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; else temp |= CURSOR_MODE_64_4C_AX; temp |= (pI830->pipe << 28); /* Connect to correct pipe */ |