xf86-video-ati: Branch 'randr-1.2' - 2 commits

[Alex Deucher]

 src/radeon_output.c |    9 +++++++--
 src/radeon_reg.h    |    1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
diff-tree e3e9c608651e7cbb9851489274815f47d2a8dbbb (from a7d2c9c0f6155c4e65a2e73f3832c0d8ca7af5fc)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Fri May 25 19:26:24 2007 -0400

    RADEON: more clean of last commits

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 0577a05..4e2fa0c 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -192,12 +192,14 @@ static RADEONMonitorType RADEONPortCheck
     if (radeon_output->type == OUTPUT_LVDS) {
 	if (INREG(RADEON_BIOS_4_SCRATCH) & 4)
 	    MonType =  MT_LCD;
-    } else if (radeon_output->TMDSType == TMDS_INT) {
-	if (INREG(RADEON_FP_GEN_CNTL) & RADEON_FP_DETECT_SENSE)
-	    MonType = MT_DFP;
-    } else if (radeon_output->TMDSType == TMDS_EXT) {
-	if (INREG(RADEON_FP2_GEN_CNTL) & RADEON_FP2_DETECT_SENSE)
-	    MonType = MT_DFP;
+    } else if (radeon_output->type == OUTPUT_DVI) {
+	if (radeon_output->TMDSType == TMDS_INT) {
+	    if (INREG(RADEON_FP_GEN_CNTL) & RADEON_FP_DETECT_SENSE)
+		MonType = MT_DFP;
+	} else if (radeon_output->TMDSType == TMDS_EXT) {
+	    if (INREG(RADEON_FP2_GEN_CNTL) & RADEON_FP2_DETECT_SENSE)
+		MonType = MT_DFP;
+	}
     }
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff-tree a7d2c9c0f6155c4e65a2e73f3832c0d8ca7af5fc (from e50ca35ce2ea79dadb38ce14e459eed836452ff7)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Fri May 25 19:09:11 2007 -0400

    RADEON: fixup last commit and add support for ext TMDS detect

diff --git a/src/radeon_output.c b/src/radeon_output.c
index e823120..0577a05 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -192,9 +192,12 @@ static RADEONMonitorType RADEONPortCheck
     if (radeon_output->type == OUTPUT_LVDS) {
 	if (INREG(RADEON_BIOS_4_SCRATCH) & 4)
 	    MonType =  MT_LCD;
-    } else if (radeon_output->type == OUTPUT_DVI) {
+    } else if (radeon_output->TMDSType == TMDS_INT) {
 	if (INREG(RADEON_FP_GEN_CNTL) & RADEON_FP_DETECT_SENSE)
 	    MonType = MT_DFP;
+    } else if (radeon_output->TMDSType == TMDS_EXT) {
+	if (INREG(RADEON_FP2_GEN_CNTL) & RADEON_FP2_DETECT_SENSE)
+	    MonType = MT_DFP;
     }
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index 0d5e586..b8bff78 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -742,6 +742,7 @@
 #       define RADEON_FP2_BLANK_EN             (1 <<  1)
 #       define RADEON_FP2_ON                   (1 <<  2)
 #       define RADEON_FP2_PANEL_FORMAT         (1 <<  3)
+#       define RADEON_FP2_DETECT_SENSE         (1 <<  8)
 #       define R200_FP2_SOURCE_SEL_MASK        (3 << 10)
 #       define R200_FP2_SOURCE_SEL_CRTC1       (0 <<  10)
 #       define R200_FP2_SOURCE_SEL_CRTC2       (1 << 10)