Gitweb: http://git.kernel.org/linus/9c552dd79346f86a3b53e41255c92c6f560b80fb
Commit: 9c552dd79346f86a3b53e41255c92c6f560b80fb
Parent: a3a0544b2c84e1d7a2022b558ecf66d8c6a8dd93
Author: Dave Airlie <airlied@linux.ie>
AuthorDate: Wed Sep 2 14:00:11 2009 +1000
Committer: Dave Airlie <airlied@linux.ie>
CommitDate: Wed Sep 2 14:00:11 2009 +1000
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>
---
drivers/gpu/drm/drm_crtc_helper.c | 4 ++--
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 eea5e6c..db0237d 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) {
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
