xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/legacy_output.c |   20 --------------------
 src/radeon_bios.c   |    4 +++-
 2 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit cfaa23d925e3c062cf87ea844566ac11ea02d69e
Author: Alex Deucher <alex at botchco.com>
Date:   Fri Jun 27 20:36:54 2008 -0400

    RADEON: IGP VGA fixes take 2
    
    It seems only RS300/350/400/480 are missing the primary dac
    See bug 15708

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 529dda7..1faada9 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -529,7 +529,9 @@ static Bool RADEONGetLegacyConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 		info->BiosConnector[i].DACType = DAC_PRIMARY;
 
 	    /* For RS300/RS350/RS400 chips, there is no primary DAC. Force VGA port to use TVDAC*/
-	    if (info->IsIGP)
+	    if ((info->ChipFamily == CHIP_FAMILY_RS300) ||
+		(info->ChipFamily == CHIP_FAMILY_RS400) ||
+		(info->ChipFamily == CHIP_FAMILY_RS480))
 		info->BiosConnector[i].DACType = DAC_TVDAC;
 
 	    if ((tmp >> 4) & 0x1)
commit 31c27ffcb3c4c5334cf726ecd4e293a678b2a1ea
Author: Alex Deucher <alex at botchco.com>
Date:   Fri Jun 27 20:29:04 2008 -0400

    Revert "IGP: attempt to fix VGA on IGP chips"
    
    This reverts commit e78e8a21b4040cd7f1983c241c860d9209398396.

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);