drm/radeon/kms/atom: add support for setting DP panel mode
Required for proper operation with DP bridges. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
39b3bdb62a
commit
558e27db8f
|
@ -662,9 +662,9 @@ void dp_link_train(struct drm_encoder *encoder,
|
||||||
dp_set_downspread(radeon_connector, 0);
|
dp_set_downspread(radeon_connector, 0);
|
||||||
if (ASIC_IS_DCE4(rdev)) {
|
if (ASIC_IS_DCE4(rdev)) {
|
||||||
/* start training on the source */
|
/* 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 */
|
/* 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 {
|
} else {
|
||||||
/* start training on the source */
|
/* start training on the source */
|
||||||
radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_START,
|
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);
|
dp_set_training(radeon_connector, DP_TRAINING_PATTERN_2);
|
||||||
/* set training pattern 2 on the source */
|
/* set training pattern 2 on the source */
|
||||||
if (ASIC_IS_DCE4(rdev))
|
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
|
else
|
||||||
radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_PATTERN_SEL,
|
radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_PATTERN_SEL,
|
||||||
dig_connector->dp_clock, enc_id, 1);
|
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 */
|
/* disable the training pattern on the source */
|
||||||
if (ASIC_IS_DCE4(rdev))
|
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
|
else
|
||||||
radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_COMPLETE,
|
radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_COMPLETE,
|
||||||
dig_connector->dp_clock, enc_id, 0);
|
dig_connector->dp_clock, enc_id, 0);
|
||||||
|
|
|
@ -771,7 +771,7 @@ union dig_encoder_control {
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
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 drm_device *dev = encoder->dev;
|
||||||
struct radeon_device *rdev = dev->dev_private;
|
struct radeon_device *rdev = dev->dev_private;
|
||||||
|
@ -817,7 +817,10 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action)
|
||||||
|
|
||||||
args.v1.ucAction = action;
|
args.v1.ucAction = action;
|
||||||
args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
|
args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
|
||||||
args.v1.ucEncoderMode = atombios_get_encoder_mode(encoder);
|
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) ||
|
if ((args.v1.ucEncoderMode == ATOM_ENCODER_MODE_DP) ||
|
||||||
(args.v1.ucEncoderMode == ATOM_ENCODER_MODE_DP_MST))
|
(args.v1.ucEncoderMode == ATOM_ENCODER_MODE_DP_MST))
|
||||||
|
@ -1416,7 +1419,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
|
||||||
}
|
}
|
||||||
dp_link_train(encoder, connector);
|
dp_link_train(encoder, connector);
|
||||||
if (ASIC_IS_DCE4(rdev))
|
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))
|
if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
|
||||||
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_LCD_BLON, 0, 0);
|
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);
|
struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
|
||||||
|
|
||||||
if (ASIC_IS_DCE4(rdev))
|
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 &&
|
if (connector &&
|
||||||
(connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
|
(connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
|
||||||
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
|
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 */
|
/* disable the transmitter */
|
||||||
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
|
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
|
||||||
/* setup and enable the encoder */
|
/* 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 */
|
/* init and enable the transmitter */
|
||||||
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_INIT, 0, 0);
|
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 {
|
} else {
|
||||||
/* disable the encoder and transmitter */
|
/* disable the encoder and transmitter */
|
||||||
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
|
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 */
|
/* 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_INIT, 0, 0);
|
||||||
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
|
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
|
||||||
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 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 {
|
else {
|
||||||
/* disable the encoder and transmitter */
|
/* disable the encoder and transmitter */
|
||||||
atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
|
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;
|
break;
|
||||||
case ENCODER_OBJECT_ID_INTERNAL_DDI:
|
case ENCODER_OBJECT_ID_INTERNAL_DDI:
|
||||||
|
|
|
@ -479,7 +479,7 @@ extern void dp_link_train(struct drm_encoder *encoder,
|
||||||
struct drm_connector *connector);
|
struct drm_connector *connector);
|
||||||
extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);
|
extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);
|
||||||
extern bool radeon_dp_getdpcd(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,
|
extern void atombios_dig_transmitter_setup(struct drm_encoder *encoder,
|
||||||
int action, uint8_t lane_num,
|
int action, uint8_t lane_num,
|
||||||
uint8_t lane_set);
|
uint8_t lane_set);
|
||||||
|
|
Loading…
Reference in a new issue