diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-23 21:37:58 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-23 21:37:58 -0400 |
| commit | abb9b57e7b4162ab6c21fd1e809d24f13f7e1ea1 (patch) | |
| tree | 84218081fbdd176530afe780ec1cde7d51a75f60 | |
| parent | 679236defd28bea8874004377436347950ff7bec (diff) | |
RADEON: clean up some logic
| -rw-r--r-- | src/radeon_display.c | 19 | ||||
| -rw-r--r-- | src/radeon_output.c | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 76affcbd..3bbf3714 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -568,14 +568,17 @@ RADEONMonitorType RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr out ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1)); if (*MonInfo) { - /* if it's digital */ - if ((*MonInfo)->rawData[0x14] & 0x80) { - if ((info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_LVDS_ATOM) || - radeon_output->ConnectorType == CONNECTOR_PROPRIETARY) - MonType = MT_LCD; - else - MonType = MT_DFP; - } else MonType = MT_CRT; + if ((info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_LVDS_ATOM) || + (!info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_PROPRIETARY)) { + MonType = MT_LCD; + } else if ((info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_DVI_D_ATOM) || + (!info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_DVI_D)) { + MonType = MT_DFP; + } else if ((*MonInfo)->rawData[0x14] & 0x80) { /* if it's digital */ + MonType = MT_DFP; + } else { + MonType = MT_CRT; + } } else MonType = MT_NONE; xf86DrvMsg(pScrn->scrnIndex, X_INFO, diff --git a/src/radeon_output.c b/src/radeon_output.c index ce743c50..e45690bf 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -191,7 +191,7 @@ static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr if (info->IsMobility) { if ((info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_LVDS_ATOM) || - radeon_output->ConnectorType == CONNECTOR_PROPRIETARY) { + (!info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_PROPRIETARY)) { if (INREG(RADEON_BIOS_4_SCRATCH) & 4) MonType = MT_LCD; } |