Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43a34026 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/atom: don't call [EN|DIS]ABLE_OUTPUT on DCE3.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: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4573388c

drivers/gpu/drm/radeon/atombios_encoders.c

+0 −8
Original line number Diff line number Diff line
@@ -1650,13 +1650,6 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) 
			atombios_dig_encoder_setup(encoder, ATOM_ENABLE, 0);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);

			/* some dce3.x boards have a bug in their transmitter control table.

			 * ACTION_ENABLE_OUTPUT can probably be dropped since ACTION_ENABLE

			 * does the same thing and more.

			 */

			if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730) &&

			    (rdev->family != CHIP_RS880))

				atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);

		}

		if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) {

			if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
@@ -1683,7 +1676,6 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) 
			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

		} else {

			/* disable the encoder and transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

			atombios_dig_encoder_setup(encoder, ATOM_DISABLE, 0);

		}