diff options
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_dp.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index a71557ce01dc..552b436451fd 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
| @@ -564,9 +564,21 @@ int radeon_dp_get_panel_mode(struct drm_encoder *encoder, | |||
| 564 | ENCODER_OBJECT_ID_NUTMEG) | 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) == | 566 | else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == |
| 567 | ENCODER_OBJECT_ID_TRAVIS) | 567 | ENCODER_OBJECT_ID_TRAVIS) { |
| 568 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; | 568 | u8 id[6]; |
| 569 | else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { | 569 | int i; |
| 570 | for (i = 0; i < 6; i++) | ||
| 571 | id[i] = radeon_read_dpcd_reg(radeon_connector, 0x503 + i); | ||
| 572 | if (id[0] == 0x73 && | ||
| 573 | id[1] == 0x69 && | ||
| 574 | id[2] == 0x76 && | ||
| 575 | id[3] == 0x61 && | ||
| 576 | id[4] == 0x72 && | ||
| 577 | id[5] == 0x54) | ||
| 578 | panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; | ||
| 579 | else | ||
| 580 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; | ||
| 581 | } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { | ||
| 570 | u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); | 582 | u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); |
| 571 | if (tmp & 1) | 583 | if (tmp & 1) |
| 572 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; | 584 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; |