From 074d0d3b3d71fd8dc34749549159a0e5e76fd439 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 6 Dec 2010 11:24:07 +0000
Subject: [PATCH] --- yaml --- r: 223023 b: refs/heads/master c:
 541cc966915b6756e54c20eebe60ae957afdb537 h: refs/heads/master i:   223021:
 e27947e90ecb396cd9836fedbcd959883df2cba5   223019:
 79d15b2cf9fe02c12b5d79fa280bfabf2be76b55   223015:
 ab13e4d929ed633def1312b686bee40f782a7376   223007:
 7d831ec36dea37fbee6b391abf039eb06f726d54 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/drm_crtc_helper.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ebec3a2d7d80..38ed8ca0fcb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea5d552c73707645c53d42e8a71c9a4d9cbb85c1
+refs/heads/master: 541cc966915b6756e54c20eebe60ae957afdb537
diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c
index 7ca59359fee2..bede10a03407 100644
--- a/trunk/drivers/gpu/drm/drm_crtc_helper.c
+++ b/trunk/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 (!drm_helper_encoder_in_use(encoder)) {
+		if (encoder->crtc && !drm_helper_encoder_in_use(encoder)) {
 			drm_encoder_disable(encoder);
 			/* disconnector encoder from any connector */
 			encoder->crtc = NULL;