summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-12-06 11:24:07 +0000
committerDave Airlie <airlied@redhat.com>2010-12-08 09:33:02 +1000
commit541cc966915b6756e54c20eebe60ae957afdb537 (patch)
treef8e24751b5545577e1b480424e1514b5cfc4e042 /drivers/gpu
parentea5d552c73707645c53d42e8a71c9a4d9cbb85c1 (diff)
downloadop-kernel-dev-541cc966915b6756e54c20eebe60ae957afdb537.zip
op-kernel-dev-541cc966915b6756e54c20eebe60ae957afdb537.tar.gz
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_crtc_helper.c2
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 7ca59359..bede10a 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;
OpenPOWER on IntegriCloud