aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2009-09-02 14:00:11 +1000
committerDave Airlie <airlied@linux.ie>2009-09-02 14:00:11 +1000
commit9c552dd79346f86a3b53e41255c92c6f560b80fb (patch)
treed7cc9c5d9987ef2bdf36c821b60b7ebf7eee38d3 /drivers/gpu/drm
parenta3a0544b2c84e1d7a2022b558ecf66d8c6a8dd93 (diff)
drm/crtc: fix mismerge of last patch.
We only want to NULL encoder->crtc when it is off. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/drm_crtc_helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index eea5e6c4099..db0237dec6c 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -278,9 +278,9 @@ void drm_helper_disable_unused_functions(struct drm_device *dev)
(*encoder_funcs->disable)(encoder);
else
(*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) {