diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_dp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index ff47186b5629..a0de48542f71 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
| @@ -560,9 +560,12 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, | |||
| 560 | if (!ASIC_IS_DCE4(rdev)) | 560 | if (!ASIC_IS_DCE4(rdev)) |
| 561 | return; | 561 | return; |
| 562 | 562 | ||
| 563 | if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) != | 563 | if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == |
| 564 | ENCODER_OBJECT_ID_NONE) | 564 | ENCODER_OBJECT_ID_NUTMEG) |
| 565 | panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; | 565 | panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; |
| 566 | else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == | ||
| 567 | ENCODER_OBJECT_ID_TRAVIS) | ||
| 568 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; | ||
| 566 | else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { | 569 | else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { |
| 567 | u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); | 570 | u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); |
| 568 | if (tmp & 1) | 571 | if (tmp & 1) |
