xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/atombios_output.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7aaf5f08e4147b75c4975e6d680d3f5a93424164
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Mar 23 12:55:02 2009 -0400

    R4xx ATOM: fix crtc routing for CRT1
    
    should fix bug 20814

diff --git a/src/atombios_output.c b/src/atombios_output.c
index 35d1767..4af04c1 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -1406,8 +1406,12 @@ atombios_set_output_crtc_source(xf86OutputPtr output)
 	default:
 	    if (IS_AVIVO_VARIANT)
 		crtc_src_param.ucCRTC = radeon_crtc->crtc_id;
-	    else
-		crtc_src_param.ucCRTC = radeon_crtc->crtc_id << 2;
+	    else {
+		if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)
+		    crtc_src_param.ucCRTC = radeon_crtc->crtc_id;
+		else
+		    crtc_src_param.ucCRTC = radeon_crtc->crtc_id << 2;
+	    }
 	    switch (radeon_encoder->encoder_id) {
 	    case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: