diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-04-18 09:21:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-22 19:21:45 -0400 |
commit | 5ee15f20f90173a0ed53099499d4722a803a0d85 (patch) | |
tree | a9f9ad0a94f9f59bbde15a0e3fb4b6245fe5b097 | |
parent | 631792ffa5b781301812b8514b8c0a10eb8ce5d7 (diff) |
drm/radeon/kms: fix the regression of DVI connector check
commit e36325071832f1ba96ac54fb8ba1459f08b05dd8 upstream.
The check of the encoder type in the commit [e00e8b5e: drm/radeon/kms:
fix analog load detection on DVI-I connectors] is obviously wrong, and
it's the culprit of the regression on my workstation with DVI-analog
connection resulting in the blank output.
Fixed the typo now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 6ceb3c81a11..74f67cb6103 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
@@ -990,7 +990,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) | |||
990 | 990 | ||
991 | encoder = obj_to_encoder(obj); | 991 | encoder = obj_to_encoder(obj); |
992 | 992 | ||
993 | if (encoder->encoder_type != DRM_MODE_ENCODER_DAC || | 993 | if (encoder->encoder_type != DRM_MODE_ENCODER_DAC && |
994 | encoder->encoder_type != DRM_MODE_ENCODER_TVDAC) | 994 | encoder->encoder_type != DRM_MODE_ENCODER_TVDAC) |
995 | continue; | 995 | continue; |
996 | 996 | ||