diff --git a/[refs] b/[refs]
index 7835bf00e69c..bd22ce7f95d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3a0544b2c84e1d7a2022b558ecf66d8c6a8dd93
+refs/heads/master: 9c552dd79346f86a3b53e41255c92c6f560b80fb
diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c
index eea5e6c4099c..db0237dec6c4 100644
--- a/trunk/drivers/gpu/drm/drm_crtc_helper.c
+++ b/trunk/drivers/gpu/drm/drm_crtc_helper.c
@@ -278,9 +278,9 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
 				(*encoder_funcs->disable)(encoder);
 			else
 				(*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
+			/* disconnector encoder from any connector */
+			encoder->crtc = NULL;
 		}
-		/* disconnector encoder from any connector */
-		encoder->crtc = NULL;
 	}
 
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {