summaryrefslogtreecommitdiff
path: root/src/i830_crt.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@mandolin.keithp.com>2006-11-08 20:23:20 -0800
committerKeith Packard <keithp@mandolin.keithp.com>2006-11-08 20:23:20 -0800
commit81bace0c316c3ed80201a34eca533254d12cd193 (patch)
tree35811dca1547d1a6074c821b9bc1e3146574c84d /src/i830_crt.c
parent713c5b0899428edfea7cea0780244488115dbe1d (diff)
parentbeb89163d73376e70870e6e2a6b19863f3a058b1 (diff)
Merge branch 'modesetting-keithp' into modesetting
Conflicts in PipeSetMode were resolved to use the keithp changes that pushed more modesetting stuff into the per-pipe function. Switched availablePipes to num_pipes. Used modesetting default output configuration.
Diffstat (limited to 'src/i830_crt.c')
-rw-r--r--src/i830_crt.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/i830_crt.c b/src/i830_crt.c
index 68006f99..46eb788f 100644
--- a/src/i830_crt.c
+++ b/src/i830_crt.c
@@ -102,8 +102,14 @@ i830_crt_post_set_mode(ScrnInfoPtr pScrn, I830OutputPtr output,
DisplayModePtr pMode)
{
I830Ptr pI830 = I830PTR(pScrn);
+ int dpll_md_reg = (output->pipe == 0) ? DPLL_A_MD : DPLL_B_MD;
+ CARD32 adpa;
- CARD32 adpa;
+ /*
+ * Not quite sure precisely what this does...
+ */
+ if (IS_I965G(pI830))
+ OUTREG(dpll_md_reg, 0x3 << DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT);
adpa = ADPA_DAC_ENABLE;