diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index cfb2c8f88890..1b9177ed181f 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
| @@ -1288,17 +1288,15 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector, | |||
| 1288 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) || | 1288 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) || |
| 1289 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) | 1289 | (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) |
| 1290 | return MODE_OK; | 1290 | return MODE_OK; |
| 1291 | else if (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_A) { | 1291 | else if (ASIC_IS_DCE6(rdev) && drm_detect_hdmi_monitor(radeon_connector->edid)) { |
| 1292 | if (ASIC_IS_DCE6(rdev)) { | 1292 | /* HDMI 1.3+ supports max clock of 340 Mhz */ |
| 1293 | /* HDMI 1.3+ supports max clock of 340 Mhz */ | 1293 | if (mode->clock > 340000) |
| 1294 | if (mode->clock > 340000) | ||
| 1295 | return MODE_CLOCK_HIGH; | ||
| 1296 | else | ||
| 1297 | return MODE_OK; | ||
| 1298 | } else | ||
| 1299 | return MODE_CLOCK_HIGH; | 1294 | return MODE_CLOCK_HIGH; |
| 1300 | } else | 1295 | else |
| 1296 | return MODE_OK; | ||
| 1297 | } else { | ||
| 1301 | return MODE_CLOCK_HIGH; | 1298 | return MODE_CLOCK_HIGH; |
| 1299 | } | ||
| 1302 | } | 1300 | } |
| 1303 | 1301 | ||
| 1304 | /* check against the max pixel clock */ | 1302 | /* check against the max pixel clock */ |