Commit 58682f10 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon/kms: do dp link training at dpms on time not mode set. 



This moves the radeon DP link training call to happen when we
dpms on the encoder not when we set the mode.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 5fbfce7f

drivers/gpu/drm/radeon/radeon_encoders.c

+6 −4
Original line number Diff line number Diff line
@@ -996,12 +996,16 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
	if (is_dig) {

		switch (mode) {

		case DRM_MODE_DPMS_ON:

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);

			{

				struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

				dp_link_train(encoder, connector);

			}

			break;

		case DRM_MODE_DPMS_STANDBY:

		case DRM_MODE_DPMS_SUSPEND:

		case DRM_MODE_DPMS_OFF:

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT);

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);

			break;

		}

	} else {
@@ -1201,7 +1205,6 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);

	struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);



	if (radeon_encoder->active_device &

	    (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) {
@@ -1244,7 +1247,6 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_INIT, 0, 0);

		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);

		atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);

		dp_link_train(encoder, connector);

		break;

	case ENCODER_OBJECT_ID_INTERNAL_DDI:

		atombios_ddia_setup(encoder, ATOM_ENABLE);