summaryrefslogtreecommitdiff
path: root/src/i830_display.c
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2006-06-21 17:11:54 -0700
committerEric Anholt <anholt@FreeBSD.org>2006-06-21 17:11:54 -0700
commit66d9a1be302ad34573de98de21cbdf6419592092 (patch)
tree4eec7edb5342d03eadbfea1a34e26fead9d25f6d /src/i830_display.c
parent72e25a7488c2eabcc92e9e0769a89dee687f52fd (diff)
Detect SDVO display presence at startup and default to displaying to it, too.
Diffstat (limited to 'src/i830_display.c')
-rw-r--r--src/i830_display.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/i830_display.c b/src/i830_display.c
index 0fadc0c1..8843f989 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -514,11 +514,6 @@ i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe)
/* And then turn the plane on */
OUTREG(DSPACNTR, dspcntr);
-
- if (is_sdvo) {
- OUTREG(SDVOB, sdvob);
- OUTREG(SDVOC, sdvoc);
- }
} else {
/* Always make sure the LVDS is off before we play with DPLLs and pipe
* configuration.
@@ -591,6 +586,11 @@ i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe)
if (outputs & PIPE_CRT_ACTIVE)
OUTREG(ADPA, adpa);
+ if (is_sdvo) {
+ OUTREG(SDVOB, sdvob);
+ OUTREG(SDVOC, sdvoc);
+ }
+
return TRUE;
}