[PATCH 169/222] drm/i915: don't disable disconnected outputs
Russell King
rmk+kernel at arm.linux.org.uk
Fri Apr 25 04:49:04 PDT 2014
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
Conflicts:
drivers/gpu/drm/drm_crtc_helper.c
---
drivers/gpu/drm/drm_crtc_helper.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index c43825e8f5c1..039dbcd1dd98 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -281,16 +281,10 @@ drm_encoder_disable(struct drm_encoder *encoder)
static void __drm_helper_disable_unused_functions(struct drm_device *dev)
{
struct drm_encoder *encoder;
- struct drm_connector *connector;
struct drm_crtc *crtc;
drm_warn_on_modeset_not_all_locked(dev);
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- if (!connector->encoder)
- continue;
- }
-
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
if (!drm_helper_encoder_in_use(encoder)) {
drm_encoder_disable(encoder);
--
1.8.3.1
More information about the linux-arm-kernel
mailing list