From 4e41419c1ed9e2ad58a3c2fc24287452c4739a77 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 16 Mar 2012 12:22:09 -0400 Subject: [PATCH] --- yaml --- r: 293814 b: refs/heads/master c: e00e8b5e760cbbe9067daeae5454d67c44c8d035 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1d8a3a1ef011..aea4432c5f54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25d0479a5925562fbf999afb5a8daa3f501c729d +refs/heads/master: e00e8b5e760cbbe9067daeae5454d67c44c8d035 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c index 8c9a8115b632..d2e614479e6f 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/trunk/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) {