diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-10-05 18:36:50 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-16 14:14:54 -0700 |
| commit | 00b8e8ceece20db990b1fbb11f1d6051a276436b (patch) | |
| tree | 16d107bdecff8a5fd93c700f21a671ffddb061e0 | |
| parent | 3450eab782ae71a60f33969fd7e8d793b08ae980 (diff) | |
| download | kernel_samsung_smdk4412-00b8e8ceece20db990b1fbb11f1d6051a276436b.zip kernel_samsung_smdk4412-00b8e8ceece20db990b1fbb11f1d6051a276436b.tar.gz kernel_samsung_smdk4412-00b8e8ceece20db990b1fbb11f1d6051a276436b.tar.bz2 | |
drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1
commit cb7cf41961fe10773c491c75ae73539ad4bbed66 upstream.
The encoders are supposedly fully routeable, but changing the mapping
doesn't always seem to take. Using a hardcoded mapping is much more
reliable.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=41366
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 13690f3..8a171b2 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -1755,9 +1755,12 @@ 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)) - return radeon_crtc->crtc_id; - else { + if (ASIC_IS_DCE41(rdev)) { + if (dig->linkb) + return 1; + else + return 0; + } else { switch (radeon_encoder->encoder_id) { case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: if (dig->linkb) |