Revert "drm: Don't try and disable an encoder that was never enabled"
Dave Airlie [Tue, 21 Dec 2010 02:47:56 +0000 (12:47 +1000)]
This reverts commit 541cc966915b6756e54c20eebe60ae957afdb537.

Wei Yonjun reported this caused a regression against Intel VGA hotplug
on his G33 hw.

Signed-off-by: Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/drm_crtc_helper.c

index bede10a..7ca5935 100644 (file)
@@ -241,7 +241,7 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
        }
 
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-               if (encoder->crtc && !drm_helper_encoder_in_use(encoder)) {
+               if (!drm_helper_encoder_in_use(encoder)) {
                        drm_encoder_disable(encoder);
                        /* disconnector encoder from any connector */
                        encoder->crtc = NULL;