diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2012-01-20 15:03:29 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-01-24 12:35:52 -0500 |
commit | 27d9cc8428367e0fec2fc0fc6385e9241b079c3a (patch) | |
tree | 08978805dc4d23a9d85c17e43e2b521362301348 | |
parent | 3a47824d85eeca122895646f027dc63480994199 (diff) |
drm/radeon/kms: use drm_detect_hdmi_monitor for picking encoder mode
We were previously just checking for audio.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/radeon/atombios_encoders.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 79a4880e8800..f2f14a20a493 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c | |||
@@ -432,7 +432,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) | |||
432 | switch (connector->connector_type) { | 432 | switch (connector->connector_type) { |
433 | case DRM_MODE_CONNECTOR_DVII: | 433 | case DRM_MODE_CONNECTOR_DVII: |
434 | case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */ | 434 | case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */ |
435 | if (drm_detect_monitor_audio(radeon_connector->edid) && | 435 | if (drm_detect_hdmi_monitor(radeon_connector->edid) && |
436 | radeon_audio) | 436 | radeon_audio) |
437 | return ATOM_ENCODER_MODE_HDMI; | 437 | return ATOM_ENCODER_MODE_HDMI; |
438 | else if (radeon_connector->use_digital) | 438 | else if (radeon_connector->use_digital) |
@@ -443,7 +443,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) | |||
443 | case DRM_MODE_CONNECTOR_DVID: | 443 | case DRM_MODE_CONNECTOR_DVID: |
444 | case DRM_MODE_CONNECTOR_HDMIA: | 444 | case DRM_MODE_CONNECTOR_HDMIA: |
445 | default: | 445 | default: |
446 | if (drm_detect_monitor_audio(radeon_connector->edid) && | 446 | if (drm_detect_hdmi_monitor(radeon_connector->edid) && |
447 | radeon_audio) | 447 | radeon_audio) |
448 | return ATOM_ENCODER_MODE_HDMI; | 448 | return ATOM_ENCODER_MODE_HDMI; |
449 | else | 449 | else |
@@ -457,7 +457,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) | |||
457 | if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) || | 457 | if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) || |
458 | (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) | 458 | (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) |
459 | return ATOM_ENCODER_MODE_DP; | 459 | return ATOM_ENCODER_MODE_DP; |
460 | else if (drm_detect_monitor_audio(radeon_connector->edid) && | 460 | else if (drm_detect_hdmi_monitor(radeon_connector->edid) && |
461 | radeon_audio) | 461 | radeon_audio) |
462 | return ATOM_ENCODER_MODE_HDMI; | 462 | return ATOM_ENCODER_MODE_HDMI; |
463 | else | 463 | else |