From fd0713b090d1081a922dc8d84298c77ae43a2c9e Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 6 Apr 2009 13:29:56 -0400 Subject: [PATCH] radeon: fix crtc routing for CRT1 on r4xx ATOM Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_encoders.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index f9553ee..91d6ac5 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -1366,8 +1366,12 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) default: if (ASIC_IS_AVIVO(rdev)) args.v1.ucCRTC = radeon_crtc->crtc_id; - else - args.v1.ucCRTC = radeon_crtc->crtc_id << 2; + else { + if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1) + args.v1.ucCRTC = radeon_crtc->crtc_id; + else + args.v1.ucCRTC = radeon_crtc->crtc_id << 2; + } switch (radeon_encoder->encoder_id) { case ENCODER_OBJECT_ID_INTERNAL_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: -- 1.5.6.3