diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-12-21 12:47:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-12-21 12:47:56 +1000 |
| commit | 92971021c632876108ea2e06290a56a9157578f5 (patch) | |
| tree | 98a0953e3a806d90de2cd30ba43bd955f9d152e4 /drivers/gpu | |
| parent | a56f7428d7534f162fbb089c5c79012bf38a7c29 (diff) | |
| download | op-kernel-dev-92971021c632876108ea2e06290a56a9157578f5.zip op-kernel-dev-92971021c632876108ea2e06290a56a9157578f5.tar.gz | |
Revert "drm: Don't try and disable an encoder that was never enabled"
This reverts commit 541cc966915b6756e54c20eebe60ae957afdb537.
Wei Yonjun reported this caused a regression against Intel VGA hotplug
on his G33 hw.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index bede10a..7ca59359 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -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; |
