diff options
| author | Eric Anholt <eric@anholt.net> | 2008-04-10 16:06:41 -0700 |
|---|---|---|
| committer | root <root@debian-t61.sh.intel.com> | 2008-04-12 06:15:12 +0800 |
| commit | 8c23ab274a502bb1a1face5b17776e577a8f35ef (patch) | |
| tree | a59ef0f57bc7bdbf9c5fbc8fc83ca3ad3952a42c | |
| parent | 23dc90f35c6e5da33c09ebdfc53cc7837d93c886 (diff) | |
Fix compiler warning from 24-bit lvds change.
(cherry picked from commit 152a50703aa5e9ebaa9abbe448518742734a5eb7)
| -rw-r--r-- | src/i830_display.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index 4091e792..0588947d 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1080,7 +1080,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, int i; int refclk; intel_clock_t clock; - uint32_t dpll = 0, fp = 0, dspcntr, pipeconf; + uint32_t dpll = 0, fp = 0, dspcntr, pipeconf, lvds_bits = 0; Bool ok, is_sdvo = FALSE, is_dvo = FALSE; Bool is_crt = FALSE, is_lvds = FALSE, is_tv = FALSE; @@ -1097,6 +1097,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, switch (intel_output->type) { case I830_OUTPUT_LVDS: is_lvds = TRUE; + lvds_bits = intel_output->lvds_bits; break; case I830_OUTPUT_SDVO: is_sdvo = TRUE; @@ -1314,7 +1315,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, lvds |= LVDS_DITHER_ENABLE; } - lvds |= intel_output->lvds_bits; + lvds |= lvds_bits; OUTREG(LVDS, lvds); POSTING_READ(LVDS); |