---

yaml --- r: 348080 b: refs/heads/master c: b0a2658 h: refs/heads/master v: v3
git-mirror · Dec 18, 2012 · 0151caf · 0151caf
1 parent 90211a5
commit 0151caf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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. */