drm/crtc: fix mismerge of last patch.
authorDave Airlie <airlied@linux.ie>
Wed, 2 Sep 2009 04:00:11 +0000 (14:00 +1000)
committerDave Airlie <airlied@linux.ie>
Wed, 2 Sep 2009 04:00:11 +0000 (14:00 +1000)
We only want to NULL encoder->crtc when it is off.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_crtc_helper.c

index eea5e6c4099c6da2c307391dd176b68a6c3b3799..db0237dec6c444ca6b1a744ea5e7eececf1a66b9 100644 (file)
@@ -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) {