Commit f2263fc7 authored by Alex Deucher's avatar Alex Deucher

drm/radeon: improve dvi_mode_valid

Make sure we have an HDMI monitor before validating modes with
clocks >165 Mhz on single link connections.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6536a3a6
...@@ -1288,18 +1288,16 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector, ...@@ -1288,18 +1288,16 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector,
(radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) || (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) ||
(radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B))
return MODE_OK; return MODE_OK;
else if (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_A) { else if (ASIC_IS_DCE6(rdev) && drm_detect_hdmi_monitor(radeon_connector->edid)) {
if (ASIC_IS_DCE6(rdev)) {
/* HDMI 1.3+ supports max clock of 340 Mhz */ /* HDMI 1.3+ supports max clock of 340 Mhz */
if (mode->clock > 340000) if (mode->clock > 340000)
return MODE_CLOCK_HIGH; return MODE_CLOCK_HIGH;
else else
return MODE_OK; return MODE_OK;
} else } else {
return MODE_CLOCK_HIGH;
} else
return MODE_CLOCK_HIGH; return MODE_CLOCK_HIGH;
} }
}
/* check against the max pixel clock */ /* check against the max pixel clock */
if ((mode->clock / 10) > rdev->clock.max_pixel_clock) if ((mode->clock / 10) > rdev->clock.max_pixel_clock)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment