Skip to content

Commit

Permalink
Revert "drm: Don't try and disable an encoder that was never enabled"
Browse files Browse the repository at this point in the history
This reverts commit 541cc96.

Wei Yonjun reported this caused a regression against Intel VGA hotplug
on his G33 hw.

Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed Dec 21, 2010
1 parent a56f742 commit 9297102
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_crtc_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 (encoder->crtc && !drm_helper_encoder_in_use(encoder)) {
if (!drm_helper_encoder_in_use(encoder)) {
drm_encoder_disable(encoder);
/* disconnector encoder from any connector */
encoder->crtc = NULL;
Expand Down

0 comments on commit 9297102

Please sign in to comment.