diff options
author | Luc Verhaegen <libv@skynet.be> | 2005-12-04 00:12:45 +0000 |
---|---|---|
committer | Luc Verhaegen <libv@skynet.be> | 2005-12-04 00:12:45 +0000 |
commit | ac52aca2e6f808a9ecfde879c01f7a669d9cddd4 (patch) | |
tree | ab9eab23e29d1fd379d47ab66901e19c1266391c | |
parent | f1a588f863ca6b738703bc3c4f81d7270a41ed73 (diff) |
VIAGetActiveDisplay was still encapsulated in HAVE_DEBUG after the move torelease-0_2_1
ViaDebug. Or how a minute change between HEAD and release (undefining
HAVE_DEBUG) can still break things that have been around for ages. Even
a single run would've caught this. Painful. (Caught by Bryan Donlan).
Remove VIAGetActiveDisplay, debug message reads out CR3E directly.
-rw-r--r-- | src/via_mode.c | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/via_mode.c b/src/via_mode.c index a654a7f..8e9674f 100644 --- a/src/via_mode.c +++ b/src/via_mode.c @@ -265,31 +265,6 @@ ViaOutputsDetect(ScrnInfoPtr pScrn) } } -#ifdef HAVE_DEBUG -/* - * Returns: - * Bit[7] 2nd Path - * Bit[6] 1/0 MHS Enable/Disable - * Bit[5] 0 = Bypass Callback, 1 = Enable Callback - * Bit[4] 0 = Hot-Key Sequence Control (OEM Specific) - * Bit[3] LCD - * Bit[2] TV - * Bit[1] CRT - * Bit[0] DVI - */ -static CARD8 -VIAGetActiveDisplay(ScrnInfoPtr pScrn) -{ - vgaHWPtr hwp = VGAHWPTR(pScrn); - CARD8 tmp; - - tmp = (hwp->readCrtc(hwp, 0x3E) >> 4); - tmp |= ((hwp->readCrtc(hwp, 0x3B) & 0x18) << 3); - - return tmp; -} -#endif /* HAVE_DEBUG */ - /* * */ @@ -298,17 +273,18 @@ ViaOutputsSelect(ScrnInfoPtr pScrn) { VIAPtr pVia = VIAPTR(pScrn); VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo; + vgaHWPtr hwp = VGAHWPTR(pScrn); if (pVia->IsSecondary) { /* we just abort for now */ - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ViaOutputsSelect:" - " Not handling secondary.\n"); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: Not handling secondary.\n", + __func__); return FALSE; } VIAFUNC(pScrn->scrnIndex); ViaDebug(pScrn->scrnIndex, "X Configuration: 0x%02x\n", pVia->ActiveDevice); ViaDebug(pScrn->scrnIndex, "BIOS Initialised register: 0x%02x\n", - VIAGetActiveDisplay(pScrn)); + hwp->readCrtc(hwp, 0x3E)); pBIOSInfo->PanelActive = FALSE; pBIOSInfo->CrtActive = FALSE; |