From 19b4f5f9b647cd470616b8ec1d34f1e4afa357ad Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 27 Oct 2009 11:55:20 -0400 Subject: ATOM: fix up DVO for DCE 3.x AdjustDisplayPll takes care of this for us. --- src/atombios_crtc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c index fb7728f..6c80ea6 100644 --- a/src/atombios_crtc.c +++ b/src/atombios_crtc.c @@ -328,8 +328,11 @@ atombios_crtc_set_pll(xf86CrtcPtr crtc, DisplayModePtr mode) xf86OutputPtr output = xf86_config->output[i]; if (output->crtc == crtc) { radeon_encoder = radeon_get_encoder(output); - /* DVO seems to want 2x pixel clock */ - if (radeon_encoder && (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1)) + /* DVO wants 2x pixel clock if the DVO chip is in 12 bit mode */ + /* AdjustDisplayPll handles this on DCE3.x */ + if (radeon_encoder && + (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1) && + !IS_DCE3_VARIANT) sclock *= 2; } } -- cgit v1.2.3