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

Commit 558e27db authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/atom: add support for setting DP panel mode 



Required for proper operation with DP bridges.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 39b3bdb6

drivers/gpu/drm/radeon/atombios_dp.c

+4 −4
Original line number Diff line number Diff line
@@ -662,9 +662,9 @@ void dp_link_train(struct drm_encoder *encoder, 
	dp_set_downspread(radeon_connector, 0);

	if (ASIC_IS_DCE4(rdev)) {

		/* start training on the source */

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_START);

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_START, 0);

		/* set training pattern 1 on the source */

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_PATTERN1);

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_PATTERN1, 0);

	} else {

		/* start training on the source */

		radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_START,
@@ -733,7 +733,7 @@ void dp_link_train(struct drm_encoder *encoder, 
	dp_set_training(radeon_connector, DP_TRAINING_PATTERN_2);

	/* set training pattern 2 on the source */

	if (ASIC_IS_DCE4(rdev))

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_PATTERN2);

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_PATTERN2, 0);

	else

		radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_PATTERN_SEL,

					  dig_connector->dp_clock, enc_id, 1);
@@ -777,7 +777,7 @@ void dp_link_train(struct drm_encoder *encoder, 


	/* disable the training pattern on the source */

	if (ASIC_IS_DCE4(rdev))

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_COMPLETE);

		atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_COMPLETE, 0);

	else

		radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_COMPLETE,

					  dig_connector->dp_clock, enc_id, 0);

drivers/gpu/drm/radeon/radeon_encoders.c

+11 −8
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ union dig_encoder_control { 
};



void

atombios_dig_encoder_setup(struct drm_encoder *encoder, int action)

atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode)

{

	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;
@@ -817,6 +817,9 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action) 


	args.v1.ucAction = action;

	args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);

	if (action == ATOM_ENCODER_CMD_SETUP_PANEL_MODE)

		args.v3.ucPanelMode = panel_mode;

	else

		args.v1.ucEncoderMode = atombios_get_encoder_mode(encoder);



	if ((args.v1.ucEncoderMode == ATOM_ENCODER_MODE_DP) ||
@@ -1416,7 +1419,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
				}

				dp_link_train(encoder, connector);

				if (ASIC_IS_DCE4(rdev))

					atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_ON);

					atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_ON, 0);

			}

			if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))

				atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_LCD_BLON, 0, 0);
@@ -1429,7 +1432,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
				struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);



				if (ASIC_IS_DCE4(rdev))

					atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_OFF);

					atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_OFF, 0);

				if (connector &&

				    (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {

					struct radeon_connector *radeon_connector = to_radeon_connector(connector);
@@ -1800,7 +1803,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
			/* disable the transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

			/* setup and enable the encoder */

			atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP);

			atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0);



			/* init and enable the transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_INIT, 0, 0);
@@ -1808,10 +1811,10 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
		} else {

			/* disable the encoder and transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

			atombios_dig_encoder_setup(encoder, ATOM_DISABLE);

			atombios_dig_encoder_setup(encoder, ATOM_DISABLE, 0);



			/* setup and enable the encoder and transmitter */

			atombios_dig_encoder_setup(encoder, ATOM_ENABLE);

			atombios_dig_encoder_setup(encoder, ATOM_ENABLE, 0);

			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);
@@ -2025,7 +2028,7 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder) 
		else {

			/* disable the encoder and transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

			atombios_dig_encoder_setup(encoder, ATOM_DISABLE);

			atombios_dig_encoder_setup(encoder, ATOM_DISABLE, 0);

		}

		break;

	case ENCODER_OBJECT_ID_INTERNAL_DDI:

drivers/gpu/drm/radeon/radeon_mode.h

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ extern void dp_link_train(struct drm_encoder *encoder, 
			  struct drm_connector *connector);

extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);

extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector);

extern void atombios_dig_encoder_setup(struct drm_encoder *encoder, int action);

extern void atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode);

extern void atombios_dig_transmitter_setup(struct drm_encoder *encoder,

					   int action, uint8_t lane_num,

					   uint8_t lane_set);