Commit 9c552dd7 authored by Dave Airlie's avatar Dave Airlie

drm/crtc: fix mismerge of last patch.

We only want to NULL encoder->crtc when it is off.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a3a0544b
...@@ -278,9 +278,9 @@ void drm_helper_disable_unused_functions(struct drm_device *dev) ...@@ -278,9 +278,9 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
(*encoder_funcs->disable)(encoder); (*encoder_funcs->disable)(encoder);
else else
(*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF); (*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) { list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment