---

yaml --- r: 318770 b: refs/heads/master c: 520c41c h: refs/heads/master v: v3
git-mirror · Jul 25, 2012 · 521d4b6 · 521d4b6
1 parent 4b1c37e
commit 521d4b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be636387f81376ff26963987531c89a63faf8a33
+refs/heads/master: 520c41cf2fa029d1e8b923ac2026f96664f17c4b
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -409,13 +409,7 @@ static void intel_lvds_prepare(struct drm_encoder *encoder)
 {
 	struct intel_lvds *intel_lvds = to_intel_lvds(encoder);
 
-	/*
-	 * Prior to Ironlake, we must disable the pipe if we want to adjust
-	 * the panel fitter. However at all other times we can just reset
-	 * the registers regardless.
-	 */
-	if (!HAS_PCH_SPLIT(encoder->dev) && intel_lvds->pfit_dirty)
-		intel_lvds_disable(intel_lvds);
+	intel_lvds_disable(intel_lvds);
 }
 
 static void intel_lvds_commit(struct drm_encoder *encoder)