xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 05fa2dee0c63d56fd523ee1ebab479bcb9f5e89d
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Feb 4 13:13:58 2010 -0500

    evergreen: minor clean up in transmitter setup
    
    both link and encoder must be set for linkb

diff --git a/src/atombios_output.c b/src/atombios_output.c
index 61f5373..0a54657 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -759,11 +759,10 @@ atombios_output_dig_transmitter_setup(xf86OutputPtr output, int action, uint8_t
 	else
 	    disp_data.v3.ucLaneNum = 4;
 
-	if (radeon_output->linkb)
+	if (radeon_output->linkb) {
 	    disp_data.v3.acConfig.ucLinkSel = 1;
-
-	if (radeon_output->dig_encoder & 1)
 	    disp_data.v2.acConfig.ucEncoderSel = 1;
+	}
 
 	// select the PLL for the UNIPHY
 	if (radeon_output->MonType == MT_DP)