summaryrefslogtreecommitdiff
path: root/src/i830_display.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-04-10 16:06:41 -0700
committerEric Anholt <eric@anholt.net>2008-04-10 16:06:41 -0700
commit152a50703aa5e9ebaa9abbe448518742734a5eb7 (patch)
tree0bd9afc581b7194cfa5683ebb6037a1ad31d9983 /src/i830_display.c
parentbaa55ffe3b67ca952e4d1ef7087335d76eb2f24b (diff)
Fix compiler warning from 24-bit lvds change.
Diffstat (limited to 'src/i830_display.c')
-rw-r--r--src/i830_display.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/i830_display.c b/src/i830_display.c
index ca5e5dcb..6ac9f9e7 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;
@@ -1319,7 +1320,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);