From 6ad4ec186e01d699ba0e8d886b4f7375c32baae5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 2 Nov 2004 08:54:53 +0000 Subject: Removing unneeded private FreeType2 symbol. Updating to EDID 1.3. (Bugzilla# 1490, Jay Cotton, Egbert Eich). Removing unneeded code. Fixed KGA handling for i810. KGA handling for chips derived from C&T chips is slightly different. The changes make the code consistent with the C&T (chips) and i740 drivers. --- src/ct_driver.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/ct_driver.c b/src/ct_driver.c index 01570da..ebeea7e 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -5609,27 +5609,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) if ((cPtr->Chipset == CHIPS_CT69000) || (cPtr->Chipset == CHIPS_CT69030)) { /* The 690xx has overflow bits for the horizontal values as well */ ChipsNew->CR[0x38] = (((mode->CrtcHTotal >> 3) - 5) & 0x100) >> 8; -#if 0 - /* We need to redo the overscan voodoo from vgaHW.c */ - ChipsStd->CRTC[3] = (ChipsStd->CRTC[3] & ~0x1F) - | (((mode->CrtcHBlankEnd >> 3) - 1) & 0x1F); - ChipsStd->CRTC[5] = (ChipsStd->CRTC[5] & ~0x80) - | ((((mode->CrtcHBlankEnd >> 3) - 1) & 0x20) << 2); - ChipsNew->CR[0x3C] = ((mode->CrtcHBlankEnd >> 3) - 1) & 0xC0; - if ((mode->CrtcHBlankEnd >> 3) == (mode->CrtcHTotal >> 3)) { - int i = (ChipsStd->CRTC[3] & 0x1F) - | ((ChipsStd->CRTC[5] & 0x80) >> 2) - | (ChipsNew->CR[0x3C] & 0xC0); - if ((i-- > (ChipsStd->CRTC[2])) && - (mode->CrtcHBlankEnd == mode->CrtcHTotal)) - i = 0; - ChipsStd->CRTC[3] = (ChipsStd->CRTC[3] & ~0x1F) | (i & 0x1F); - ChipsStd->CRTC[5] = (ChipsStd->CRTC[5] & ~0x80) | ((i << 2) &0x80); - ChipsNew->CR[0x3C] = (i & 0xC0); - } -#else ChipsNew->CR[0x3C] = vgaHWHBlankKGA(mode, ChipsStd, 8, 0) << 6; -#endif } else vgaHWHBlankKGA(mode, ChipsStd, 6, 0); vgaHWVBlankKGA(mode, ChipsStd, 8, 0); -- cgit v1.2.3