summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-03-16 12:22:09 -0400
committerDave Airlie <airlied@redhat.com>2012-03-20 08:45:39 +0000
commite00e8b5e760cbbe9067daeae5454d67c44c8d035 (patch)
treea9e5fdceb3c7e47e7bde5e7f8f498a8adba5d43c
parent25d0479a5925562fbf999afb5a8daa3f501c729d (diff)
downloadop-kernel-dev-e00e8b5e760cbbe9067daeae5454d67c44c8d035.zip
op-kernel-dev-e00e8b5e760cbbe9067daeae5454d67c44c8d035.tar.gz
drm/radeon/kms: fix analog load detection on DVI-I connectors
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> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_connectors.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 8c9a811..d2e6144 100644
--- 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 *connector, bool force)
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) {
OpenPOWER on IntegriCloud