diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-11-27 15:27:36 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-11-27 15:27:36 -0500 |
| commit | 6c56e3d7655b17e93e8823aefe34b05291104695 (patch) | |
| tree | 29e71a4d09fd37488d46e60d8b84416ce40dd356 /src | |
| parent | 7561242e5b79bc2798ca3aace2b79e1a36949488 (diff) | |
RADEON: switch r4xx to atombios load detection
works great
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_output.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 6e0d0d09..d8ded6d0 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -678,33 +678,25 @@ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output) if (radeon_output->MonType == MT_UNKNOWN) { if (IS_AVIVO_VARIANT) { - if (OUTPUT_IS_TV) - radeon_output->MonType = MT_NONE; - else { - radeon_output->MonType = avivo_display_ddc_connected(pScrn, output); - if (!radeon_output->MonType) { - if (radeon_output->type == OUTPUT_LVDS) - radeon_output->MonType = MT_LCD; - else - radeon_output->MonType = atombios_dac_detect(pScrn, output); - } + radeon_output->MonType = avivo_display_ddc_connected(pScrn, output); + if (!radeon_output->MonType) { + if (radeon_output->type == OUTPUT_LVDS) + radeon_output->MonType = MT_LCD; + else if (OUTPUT_IS_TV) + radeon_output->MonType = MT_NONE; + else + radeon_output->MonType = atombios_dac_detect(pScrn, output); } } else { - if (OUTPUT_IS_TV) { - if (info->InternalTVOut) { - if (radeon_output->load_detection) - radeon_output->MonType = legacy_dac_detect(pScrn, output); - else - radeon_output->MonType = MT_NONE; - } - } else { - radeon_output->MonType = RADEONDisplayDDCConnected(pScrn, output); + radeon_output->MonType = RADEONDisplayDDCConnected(pScrn, output); + if (!radeon_output->MonType) { + if (radeon_output->type == OUTPUT_LVDS || OUTPUT_IS_DVI) + radeon_output->MonType = RADEONPortCheckNonDDC(pScrn, output); if (!radeon_output->MonType) { - if (radeon_output->type == OUTPUT_LVDS || OUTPUT_IS_DVI) - radeon_output->MonType = RADEONPortCheckNonDDC(pScrn, output); - if (!radeon_output->MonType) { + if (info->IsAtomBios) + radeon_output->MonType = atombios_dac_detect(pScrn, output); + else radeon_output->MonType = legacy_dac_detect(pScrn, output); - } } } } |