From 9c552dd79346f86a3b53e41255c92c6f560b80fb Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 2 Sep 2009 14:00:11 +1000 Subject: [PATCH] drm/crtc: fix mismerge of last patch. We only want to NULL encoder->crtc when it is off. Signed-off-by: Dave Airlie --- drivers/gpu/drm/drm_crtc_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index eea5e6c4099c..db0237dec6c4 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/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) { -- 2.11.0