drm/radeon/kms: fix the regression of DVI connector check
authorTakashi Iwai <tiwai@suse.de>
Wed, 18 Apr 2012 13:21:07 +0000 (15:21 +0200)
committerDave Airlie <airlied@redhat.com>
Thu, 19 Apr 2012 13:01:10 +0000 (14:01 +0100)
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_connectors.c

index bd05156edbdb07fc30188215fcba9d0bbef3c31f..aa8268dd3cd3dcd0d948620dac8963b7a39539b8 100644 (file)
@@ -970,7 +970,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
 
                        encoder = obj_to_encoder(obj);
 
-                       if (encoder->encoder_type != DRM_MODE_ENCODER_DAC ||
+                       if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&
                            encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)
                                continue;