summaryrefslogtreecommitdiff
path: root/src/radeon_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/radeon_output.c')
-rw-r--r--src/radeon_output.c15
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,