From 0151caff6983a7d86719c79f68544ed489ebdce8 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 18 Dec 2012 09:37:54 +0100 Subject: [PATCH] --- yaml --- r: 348080 b: refs/heads/master c: b0a2658acb5bf9ca86b4aab011b7106de3af0add h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 674c7c2f3ef7..4b72a2e5ec6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b45305fce5bb1abec263fcff9d81ebecd6306ede +refs/heads/master: b0a2658acb5bf9ca86b4aab011b7106de3af0add diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 82267b27b8f6..bc0b7aa0ab96 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -8133,10 +8133,6 @@ intel_modeset_stage_output_state(struct drm_device *dev, DRM_DEBUG_KMS("encoder changed, full mode switch\n"); config->mode_changed = true; } - - /* Disable all disconnected encoders. */ - if (connector->base.status == connector_status_disconnected) - connector->new_encoder = NULL; } /* connector->new_encoder is now updated for all connectors. */