aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-10-10 16:59:49 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-11-01 12:43:18 -0400
commit4039096199094ec78fc012154627beb8413ca1c0 (patch)
tree28810e894c62db7d30d858f9ddfc2d456efe4b32
parent43a340262ad46bb92d82c4ad119d5058bd246a26 (diff)
drm/radeon/atom: don't call [EN|DIS]ABLE_OUTPUT on DCE4.x
The plain [EN|DIS]ABLE functions do the same thing and more and aren't broken on some systems like [EN|DIS]ABLE_OUTPUT. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/atombios_encoders.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index cd77ad82d7fb..eb3ba60a2e92 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1644,7 +1644,6 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
1644 atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0); 1644 atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0);
1645 /* enable the transmitter */ 1645 /* enable the transmitter */
1646 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0); 1646 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
1647 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
1648 } else { 1647 } else {
1649 /* setup and enable the encoder and transmitter */ 1648 /* setup and enable the encoder and transmitter */
1650 atombios_dig_encoder_setup(encoder, ATOM_ENABLE, 0); 1649 atombios_dig_encoder_setup(encoder, ATOM_ENABLE, 0);
@@ -1667,12 +1666,8 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
1667 case DRM_MODE_DPMS_STANDBY: 1666 case DRM_MODE_DPMS_STANDBY:
1668 case DRM_MODE_DPMS_SUSPEND: 1667 case DRM_MODE_DPMS_SUSPEND:
1669 case DRM_MODE_DPMS_OFF: 1668 case DRM_MODE_DPMS_OFF:
1670 if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE5(rdev)) { 1669 if (ASIC_IS_DCE4(rdev)) {
1671 /* disable the transmitter */
1672 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
1673 } else if (ASIC_IS_DCE4(rdev)) {
1674 /* disable the transmitter */ 1670 /* disable the transmitter */
1675 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);
1676 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0); 1671 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
1677 } else { 1672 } else {
1678 /* disable the encoder and transmitter */ 1673 /* disable the encoder and transmitter */