diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-13 15:38:21 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-22 05:19:11 -0400 |
commit | 49d9ec1ca62a4341f387617258107a5ee7f7b3ed (patch) | |
tree | 0ecc9621f22617c6bff35bfd80290318240a646a /drivers/gpu | |
parent | 3c858a33858baa8c55fbb1a2822b086b26424bb8 (diff) |
drm/crtc-helper: gc usless connector loop in disable_unused_functions
I've forgotten to clean this all up correctly in
commit e3d6ddb35f6221859b6054879d186e13a3af351e
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue Apr 1 22:15:00 2014 +0200
drm/crtc-helper: don't disable disconnected outputs
Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index df281b54db01..20585cf62091 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
@@ -140,16 +140,10 @@ drm_encoder_disable(struct drm_encoder *encoder) | |||
140 | static void __drm_helper_disable_unused_functions(struct drm_device *dev) | 140 | static void __drm_helper_disable_unused_functions(struct drm_device *dev) |
141 | { | 141 | { |
142 | struct drm_encoder *encoder; | 142 | struct drm_encoder *encoder; |
143 | struct drm_connector *connector; | ||
144 | struct drm_crtc *crtc; | 143 | struct drm_crtc *crtc; |
145 | 144 | ||
146 | drm_warn_on_modeset_not_all_locked(dev); | 145 | drm_warn_on_modeset_not_all_locked(dev); |
147 | 146 | ||
148 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | ||
149 | if (!connector->encoder) | ||
150 | continue; | ||
151 | } | ||
152 | |||
153 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { | 147 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { |
154 | if (!drm_helper_encoder_in_use(encoder)) { | 148 | if (!drm_helper_encoder_in_use(encoder)) { |
155 | drm_encoder_disable(encoder); | 149 | drm_encoder_disable(encoder); |