diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2011-06-17 13:13:52 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-06-19 19:52:24 -0400 |
commit | 8323fa6ba313ae2664420ec34d56a7fb0bbbe525 (patch) | |
tree | 399e20759611c5fa43d6e154c25a3e007c4e11ed | |
parent | de505e709ffb09a7382ca8e0d8c7dbb171ba5830 (diff) |
drm/radeon/kms/atom: fix duallink on some early DCE3.2 cards
Certain revisions of the vbios on DCE3.2 cards have a bug
in the transmitter control table which prevents duallink from
being enabled properly on some cards. The action switch statement
jumps to the wrong offset for the OUTPUT_ENABLE action. The fix
is to use the ENABLE action rather than the OUTPUT_ENABLE action
on the affected cards. In fixed version of the vbios, both
actions jump to the same offset, so the change should be safe.
Reported-and-tested-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index f55b64cb59d1..012f80251e50 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c | |||
@@ -1431,7 +1431,11 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) | |||
1431 | if (is_dig) { | 1431 | if (is_dig) { |
1432 | switch (mode) { | 1432 | switch (mode) { |
1433 | case DRM_MODE_DPMS_ON: | 1433 | case DRM_MODE_DPMS_ON: |
1434 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); | 1434 | /* some early dce3.2 boards have a bug in their transmitter control table */ |
1435 | if ((rdev->family == CHIP_RV710) || (rdev->family == CHIP_RV730)) | ||
1436 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0); | ||
1437 | else | ||
1438 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); | ||
1435 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_DP) { | 1439 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_DP) { |
1436 | struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); | 1440 | struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); |
1437 | 1441 | ||