From: Dave Airlie <airlied@redhat.com>
Date: Tue, 21 Dec 2010 02:47:56 +0000 (+1000)
Subject: Revert "drm: Don't try and disable an encoder that was never enabled"
X-Git-Tag: firefly_0821_release~7613^2~3189^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=92971021c632876108ea2e06290a56a9157578f5;p=firefly-linux-kernel-4.4.55.git

Revert "drm: Don't try and disable an encoder that was never enabled"

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>
---

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index bede10a03407..7ca59359fee2 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -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;