diff options
| author | Alex Deucher <alex@botchco.com> | 2008-06-27 20:29:04 -0400 |
|---|---|---|
| committer | Brice Goglin <bgoglin@debian.org> | 2008-08-02 18:47:28 +0200 |
| commit | 6fb55512c4ad713a8e0568161ea21ae1221d06f1 (patch) | |
| tree | c77772de5ca69eb3edbe4cf87414596a64e4dd6d | |
| parent | 14560bd37f9ec8be42ce9c67d79139d54c3cf0b2 (diff) | |
| download | xf86-video-ati-frc-6fb55512c4ad713a8e0568161ea21ae1221d06f1.tar.gz xf86-video-ati-frc-6fb55512c4ad713a8e0568161ea21ae1221d06f1.tar.bz2 | |
Revert "IGP: attempt to fix VGA on IGP chips"
This reverts commit e78e8a21b4040cd7f1983c241c860d9209398396.
(cherry picked from commit 31c27ffcb3c4c5334cf726ecd4e293a678b2a1ea)
| -rw-r--r-- | src/legacy_output.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/legacy_output.c b/src/legacy_output.c index 9c9ebb9..4df81ab 100644 --- a/src/legacy_output.c +++ b/src/legacy_output.c @@ -727,14 +727,6 @@ RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) save->crtc2_gen_cntl |= RADEON_CRTC2_CRT2_ON; } tv_dac_change = 1; - /* IGP chips seem to use a mix of Primary and TVDAC controls */ - if (info->IsIGP) { - tmp = INREG(RADEON_CRTC_EXT_CNTL); - tmp |= RADEON_CRTC_CRT_ON; - OUTREG(RADEON_CRTC_EXT_CNTL, tmp); - save->crtc_ext_cntl |= RADEON_CRTC_CRT_ON; - RADEONDacPowerSet(pScrn, bEnable, TRUE); - } } } else if (radeon_output->MonType == MT_DFP) { if (radeon_output->TMDSType == TMDS_INT) { @@ -815,14 +807,6 @@ RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) save->crtc2_gen_cntl &= ~RADEON_CRTC2_CRT2_ON; } } - /* IGP chips seem to use a mix of Primary and TVDAC controls */ - if (info->IsIGP) { - tmp = INREG(RADEON_CRTC_EXT_CNTL); - tmp &= ~RADEON_CRTC_CRT_ON; - OUTREG(RADEON_CRTC_EXT_CNTL, tmp); - save->crtc_ext_cntl &= ~RADEON_CRTC_CRT_ON; - RADEONDacPowerSet(pScrn, bEnable, TRUE); - } } } else if (radeon_output->MonType == MT_DFP) { if (radeon_output->TMDSType == TMDS_INT) { @@ -1383,7 +1367,6 @@ RADEONInitOutputRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save, { Bool IsPrimary = crtc_num == 0 ? TRUE : FALSE; RADEONOutputPrivatePtr radeon_output = output->driver_private; - RADEONInfoPtr info = RADEONPTR(pScrn); if (crtc_num == 0) RADEONInitRMXRegisters(output, save, mode); @@ -1393,9 +1376,6 @@ RADEONInitOutputRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save, RADEONInitDACRegisters(output, save, mode, IsPrimary); } else { RADEONInitDAC2Registers(output, save, mode, IsPrimary); - /* IGP chips seem to use a mix of primary and TVDAC controls */ - if (info->IsIGP) - RADEONInitDACRegisters(output, save, mode, IsPrimary); } } else if (radeon_output->MonType == MT_LCD) { RADEONInitLVDSRegisters(output, save, mode, IsPrimary); |