diff options
| author | Eric Anholt <eric@anholt.net> | 2007-01-02 16:57:33 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-01-03 09:56:19 -0800 |
| commit | 394124ceaadb46d976ad5c3bdeb1b77d351c57f6 (patch) | |
| tree | 645f082c8e924b7a451522e7bcc910ee5d8acf07 /src/i830_cursor.c | |
| parent | 69f250af60220a875f4a04c6d682bffa352281e4 (diff) | |
Add per-CRTC gamma control support for RandR.
This makes the CRTCs now always run in gamma-enabled mode, rather than having
flaky logic for switching modes. Also, it should clear up issues with the LUTs
being uninitialized when outputs are first brought up.
Diffstat (limited to 'src/i830_cursor.c')
| -rw-r--r-- | src/i830_cursor.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/i830_cursor.c b/src/i830_cursor.c index cb1585fb..81cb3bd8 100644 --- a/src/i830_cursor.c +++ b/src/i830_cursor.c @@ -130,9 +130,7 @@ I830SetPipeCursor (xf86CrtcPtr crtc, Bool force) temp = INREG(cursor_control); temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT); if (pI830->CursorIsARGB) { - temp |= CURSOR_MODE_64_ARGB_AX; - if (intel_crtc->gammaEnabled) - temp |= MCURSOR_GAMMA_ENABLE; + temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; } else temp |= CURSOR_MODE_64_4C_AX; @@ -144,9 +142,7 @@ I830SetPipeCursor (xf86CrtcPtr crtc, Bool force) temp &= ~(CURSOR_FORMAT_MASK); temp |= CURSOR_ENABLE; if (pI830->CursorIsARGB) { - temp |= CURSOR_FORMAT_ARGB; - if (intel_crtc->gammaEnabled) - temp |= CURSOR_GAMMA_ENABLE; + temp |= CURSOR_FORMAT_ARGB | CURSOR_GAMMA_ENABLE; } else temp |= CURSOR_FORMAT_3C; OUTREG(CURSOR_CONTROL, temp); |