diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-06 11:24:07 +0000 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2010-12-08 09:33:02 +1000 |
| commit | 541cc966915b6756e54c20eebe60ae957afdb537 (patch) | |
| tree | f8e24751b5545577e1b480424e1514b5cfc4e042 | |
| parent | drm: Add missing drm_vblank_put() along queue vblank error path (diff) | |
| download | linux-dev-541cc966915b6756e54c20eebe60ae957afdb537.tar.xz linux-dev-541cc966915b6756e54c20eebe60ae957afdb537.zip | |
drm: Don't try and disable an encoder that was never enabled
Prevents code that assumes that the encoder is active when asked to be
disabled from dying a horrible death.
Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -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 7ca59359fee2..bede10a03407 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 (!drm_helper_encoder_in_use(encoder)) { + if (encoder->crtc && !drm_helper_encoder_in_use(encoder)) { drm_encoder_disable(encoder); /* disconnector encoder from any connector */ encoder->crtc = NULL; |