diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2012-03-16 12:22:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 09:27:12 -0700 |
| commit | 0f745b71c0c7fdf8ceb3712dc266cf25c5b6d537 (patch) | |
| tree | 77e2ea7181b8ba863c96263a9d655569a9fc8b75 | |
| parent | e60622654396c213acf6cbd2d520d94ae330e4f6 (diff) | |
| download | kernel_samsung_smdk4412-0f745b71c0c7fdf8ceb3712dc266cf25c5b6d537.zip kernel_samsung_smdk4412-0f745b71c0c7fdf8ceb3712dc266cf25c5b6d537.tar.gz kernel_samsung_smdk4412-0f745b71c0c7fdf8ceb3712dc266cf25c5b6d537.tar.bz2 | |
drm/radeon/kms: fix analog load detection on DVI-I connectors
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>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 4 |
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 2109c17..6ceb3c8 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -990,6 +990,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) { |