summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2008-04-25 13:28:21 -0700
committerIan Romanick <idr@us.ibm.com>2008-04-25 13:28:21 -0700
commite20644c9671be68a5f9b9e227db923166052174c (patch)
tree4ee5c45964f4c8b3b88df82d4beaf93c5cf4eb4a
parent91c3de57f3cd4d4480b2b753ffbae6a3f1cf51fd (diff)
Always select the programmable clock in alt clock select
This fixes mode setting in RANDR, but acceleration is toast.
-rw-r--r--src/xg47_native_mode.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xg47_native_mode.c b/src/xg47_native_mode.c
index 3f7ee57..e725985 100644
--- a/src/xg47_native_mode.c
+++ b/src/xg47_native_mode.c
@@ -225,6 +225,10 @@ static void FillExtendedRegisters(XGIPtr pXGI, DisplayModePtr disp_mode,
*/
regs->alt_clock_select = (disp_mode->HDisplay < 640) ? 0x20 : 0x00;
+ /* Always use the programmable clock.
+ */
+ regs->alt_clock_select |= 0x02;
+
/* See Pixel Bus Mode Register on page 9-11 of "Volari XP10 non-3D SPG
* v1.0".
@@ -411,7 +415,7 @@ void xg47_mode_restore(ScrnInfoPtr pScrn, vgaRegPtr pVgaReg, XGIRegPtr regs)
OUT3C5B(0x18, regs->seq[0x18]);
OUT3C5B(0x19, regs->seq[0x19]);
- OUTB(0x3db, (INB(0x3db) & ~0xe0) | regs->alt_clock_select);
+ OUTB(0x3db, regs->alt_clock_select);
/* Disable linear addressing.
*/