diff options
author | Alex Deucher <alex@cube.(none)> | 2008-03-01 18:52:26 -0500 |
---|---|---|
committer | Alex Deucher <alex@cube.(none)> | 2008-03-01 18:52:26 -0500 |
commit | a4398ac3ad77216f2c8aa628425bef5f2912a0a9 (patch) | |
tree | 8c9cb8cc7f673b8cdbc1e888e4ceeff467605853 | |
parent | 67d4d04836c05293b844bc505f303cfb04c0f8a4 (diff) |
RS6xx: change isIGP checks to CHIP_FAMILY_RS690
these paths are only relevant on RS6xx chips
-rw-r--r-- | src/atombios_output.c | 4 | ||||
-rw-r--r-- | src/radeon_atombios.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/atombios_output.c b/src/atombios_output.c index fb3cb3e6..da3f5339 100644 --- a/src/atombios_output.c +++ b/src/atombios_output.c @@ -393,7 +393,7 @@ dfp_disable_dither(xf86OutputPtr output, int device) OUTREG(AVIVO_TMDSA_BIT_DEPTH_CONTROL, 0); /* TMDSA */ break; case ATOM_DEVICE_DFP2_SUPPORT: - if (info->IsIGP) + if (info->ChipFamily == CHIP_FAMILY_RS690) OUTREG(AVIVO_DDIA_BIT_DEPTH_CONTROL, 0); /* DDIA */ else OUTREG(AVIVO_DVOA_BIT_DEPTH_CONTROL, 0); /* DVO */ @@ -609,7 +609,7 @@ atombios_output_mode_set(xf86OutputPtr output, atombios_output_tmds1_setup(output, adjusted_mode); dfp_disable_dither(output, ATOM_DEVICE_DFP1_SUPPORT); } else if (radeon_output->devices & ATOM_DEVICE_DFP2_SUPPORT) { - if (info->IsIGP) + if (info->ChipFamily == CHIP_FAMILY_RS690) atombios_ddia_setup(output, adjusted_mode); else atombios_external_tmds_setup(output, adjusted_mode); diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c index 351939e0..1da5e5cb 100644 --- a/src/radeon_atombios.c +++ b/src/radeon_atombios.c @@ -1754,7 +1754,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn) (i == ATOM_DEVICE_TV2_INDEX) || (i == ATOM_DEVICE_CV_INDEX)) info->BiosConnector[i].ddc_i2c.valid = FALSE; - else if (info->IsIGP) { + else if (info->ChipFamily == CHIP_FAMILY_RS690) { /* IGP DFP ports use non-standard gpio entries */ if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX)) info->BiosConnector[i].ddc_i2c = @@ -1769,7 +1769,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn) if (i == ATOM_DEVICE_DFP1_INDEX) info->BiosConnector[i].TMDSType = TMDS_INT; else if (i == ATOM_DEVICE_DFP2_INDEX) { - if (info->IsIGP) + if (info->ChipFamily == CHIP_FAMILY_RS690) info->BiosConnector[i].TMDSType = TMDS_DDIA; else info->BiosConnector[i].TMDSType = TMDS_EXT; |