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

Commit 40390961 authored by Alex Deucher's avatar Alex Deucher
Browse files

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: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43a34026

drivers/gpu/drm/radeon/atombios_encoders.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -1644,7 +1644,6 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) 
			atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0);

			atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0);

			/* enable the transmitter */

			/* enable the transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);

		} else {

		} else {

			/* setup and enable the encoder and transmitter */

			/* setup and enable the encoder and transmitter */

			atombios_dig_encoder_setup(encoder, ATOM_ENABLE, 0);

			atombios_dig_encoder_setup(encoder, ATOM_ENABLE, 0);
@@ -1667,12 +1666,8 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) 
	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

	case DRM_MODE_DPMS_OFF:

		if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE5(rdev)) {

		if (ASIC_IS_DCE4(rdev)) {

			/* disable the transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

		} else if (ASIC_IS_DCE4(rdev)) {

			/* disable the transmitter */

			/* disable the 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_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

		} else {

		} else {

			/* disable the encoder and transmitter */

			/* disable the encoder and transmitter */