diff options
| author | Alex Deucher | 2011-05-20 10:34:14 +0200 |
|---|---|---|
| committer | Dave Airlie | 2011-05-20 12:02:19 +0200 |
| commit | 96b3bef8c1d20b3f0087a26313296bf476930380 (patch) | |
| tree | 8c5d469fcd8c4f2d07383c7c3b05c8275d8b033a /drivers/gpu/drm/radeon/radeon_encoders.c | |
| parent | Merge remote branch 'keithp/drm-intel-next' of ../drm-next into drm-core-next (diff) | |
| download | kernel-qcow2-linux-96b3bef8c1d20b3f0087a26313296bf476930380.tar.gz kernel-qcow2-linux-96b3bef8c1d20b3f0087a26313296bf476930380.tar.xz kernel-qcow2-linux-96b3bef8c1d20b3f0087a26313296bf476930380.zip | |
drm/radeon/kms: DCE4.1 DIG encoders are fully routeable just like DCE3.2
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_encoders.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 99477480b98b..b2e0b586e784 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -931,10 +931,10 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t else args.v3.ucLaneNum = 4; - if (dig->linkb) { + if (dig->linkb) args.v3.acConfig.ucLinkSel = 1; + if (dig->dig_encoder & 1) args.v3.acConfig.ucEncoderSel = 1; - } /* Select the PLL for the PHY * DP PHY should be clocked from external src if there is @@ -1601,12 +1601,9 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder) /* DCE4/5 */ if (ASIC_IS_DCE4(rdev)) { dig = radeon_encoder->enc_priv; - if (ASIC_IS_DCE41(rdev)) { - if (dig->linkb) - return 1; - else - return 0; - } else { + if (ASIC_IS_DCE41(rdev)) + return radeon_crtc->crtc_id; + else { switch (radeon_encoder->encoder_id) { case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: if (dig->linkb) |