summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-05-13 13:54:04 -0400
committerAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-05-13 13:54:04 -0400
commit1c16c2ce9c5b02b03d23da965127d82eea4c4039 (patch)
tree87660895738fe5b0b5189ec3d7d3d59f212ec5dc
parent7c66e903368f77ecc4d3bd1c9f08d2adbd85e83c (diff)
RADEON: fix VT switch
-rw-r--r--src/radeon_driver.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 8e8f7a2..0616b32 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4643,7 +4643,7 @@ RADEONEnableOutputs(ScrnInfoPtr pScrn, int crtc_num)
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- xf86CrtcPtr crtc = pRADEONEnt->pCrtc[0];
+ xf86CrtcPtr crtc = pRADEONEnt->pCrtc[crtc_num];
int i;
/* get the output connected to this CRTC */
@@ -4702,7 +4702,7 @@ void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore)
RADEONRestorePLL2Registers(pScrn, restore);
RADEONRestoreFPRegisters(pScrn, restore);
RADEONRestoreDACRegisters(pScrn, restore);
- RADEONEnableOutputs(pScrn, 2);
+ RADEONEnableOutputs(pScrn, 1);
} else {
RADEONRestoreMemMapRegisters(pScrn, restore);
RADEONRestoreCommonRegisters(pScrn, restore);
@@ -4715,9 +4715,9 @@ void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore)
RADEONRestorePLLRegisters(pScrn, restore);
RADEONRestoreFPRegisters(pScrn, restore);
RADEONRestoreDACRegisters(pScrn, restore);
- RADEONEnableOutputs(pScrn, 1);
+ RADEONEnableOutputs(pScrn, 0);
if (pCRTC2->binding == 1) {
- RADEONEnableOutputs(pScrn, 2);
+ RADEONEnableOutputs(pScrn, 1);
}
}
} else {
@@ -4734,11 +4734,11 @@ void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore)
RADEONRestoreDACRegisters(pScrn, restore);
ErrorF("finished FP restore\n");
- RADEONEnableOutputs(pScrn, 1);
+ RADEONEnableOutputs(pScrn, 0);
ErrorF("enable output1 done\n");
if ((pCRTC2->binding == 1) || pRADEONEnt->HasSecondary) {
- RADEONEnableOutputs(pScrn, 2);
+ RADEONEnableOutputs(pScrn, 1);
ErrorF("enable output2 done\n");
}
}