xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 0d1f9fd03d0196dda5c1ce34b2e68b007c1874f2
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun Oct 10 12:06:22 2010 -0400

    DCE3+: UMS modesetting fixes
    
    - add mising LVTMA case statement for DCE3.0 dig encoder
    - some DCE4 systems have EN/DISABLE_OUTPUT actions

diff --git a/src/atombios_output.c b/src/atombios_output.c
index e1340fe..a028be0 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -641,6 +641,7 @@ atombios_output_dig_encoder_setup(xf86OutputPtr output, int action)
 	    disp_data.v1.ucConfig = ATOM_ENCODER_CONFIG_V2_TRANSMITTER1;
 	    break;
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 	    disp_data.v1.ucConfig = ATOM_ENCODER_CONFIG_V2_TRANSMITTER2;
 	    break;
 	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
@@ -1358,8 +1359,7 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
     case DPMSModeOn:
 	radeon_encoder->devices |= radeon_output->active_device;
 	if (is_dig) {
-	    if (!IS_DCE4_VARIANT)
-		atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
+	    atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
 	    if (((radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT) ||
 		 (radeon_output->ConnectorType == CONNECTOR_EDP)) &&
 		(radeon_output->MonType == MT_DP)) {
@@ -1391,8 +1391,7 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
 	radeon_encoder->devices &= ~(radeon_output->active_device);
 	if (!radeon_encoder->devices) {
 	    if (is_dig) {
-		if (!IS_DCE4_VARIANT)
-		    atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);
+		atombios_output_dig_transmitter_setup(output, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);
 		if (((radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT) ||
 		     (radeon_output->ConnectorType == CONNECTOR_EDP)) &&
 		    (radeon_output->MonType == MT_DP)) {