diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-25 18:56:32 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-25 18:56:32 -0400 |
| commit | e50ca35ce2ea79dadb38ce14e459eed836452ff7 (patch) | |
| tree | 17cd6ee3d7ce6d7f0a1a1779ffaeb61cb436a97d | |
| parent | abb9b57e7b4162ab6c21fd1e809d24f13f7e1ea1 (diff) | |
RADEON: clean up non-DDC probe, add detect for DVI
| -rw-r--r-- | src/radeon_output.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index e45690bf..e8231206 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -189,15 +189,12 @@ static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr RADEONMonitorType MonType = MT_NONE; - if (info->IsMobility) { - if ((info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_LVDS_ATOM) || - (!info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_PROPRIETARY)) { - if (INREG(RADEON_BIOS_4_SCRATCH) & 4) - MonType = MT_LCD; - } - /* non-DDC TMDS panel connected through DVO */ - if (INREG(RADEON_FP2_GEN_CNTL) & RADEON_FP2_ON) - MonType = MT_DFP; + if (radeon_output->type == OUTPUT_LVDS) { + if (INREG(RADEON_BIOS_4_SCRATCH) & 4) + MonType = MT_LCD; + } else if (radeon_output->type == OUTPUT_DVI) { + if (INREG(RADEON_FP_GEN_CNTL) & RADEON_FP_DETECT_SENSE) + MonType = MT_DFP; } xf86DrvMsg(pScrn->scrnIndex, X_INFO, |