| From e00e8b5e760cbbe9067daeae5454d67c44c8d035 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Fri, 16 Mar 2012 12:22:09 -0400 |
| Subject: drm/radeon/kms: fix analog load detection on DVI-I connectors |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit e00e8b5e760cbbe9067daeae5454d67c44c8d035 upstream. |
| |
| We digital encoders have a detect function as well (for |
| DP to VGA bridges), so we make sure we choose the analog |
| one here. |
| |
| Fixes: |
| https://bugs.freedesktop.org/show_bug.cgi?id=47007 |
| |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_connectors.c |
| +++ b/drivers/gpu/drm/radeon/radeon_connectors.c |
| @@ -946,6 +946,10 @@ radeon_dvi_detect(struct drm_connector * |
| |
| encoder = obj_to_encoder(obj); |
| |
| + if (encoder->encoder_type != DRM_MODE_ENCODER_DAC || |
| + encoder->encoder_type != DRM_MODE_ENCODER_TVDAC) |
| + continue; |
| + |
| encoder_funcs = encoder->helper_private; |
| if (encoder_funcs->detect) { |
| if (ret != connector_status_connected) { |
