From 5286ac4d6ebe3536f31d56b2ad871b898ba8d413 Mon Sep 17 00:00:00 2001
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Date: Fri, 8 Feb 2013 16:35:37 +0200
Subject: [PATCH] --- yaml --- r: 358207 b: refs/heads/master c:
 24a1f16de97c4cf0029d9acd04be06db32208726 h: refs/heads/master i:   358205:
 eb06ae6efa53cf531893dc86b6708143c5f64493   358203:
 d489ce50c36352215dd3d3daf321dce271c2b646   358199:
 3a1180915f7d3e677e39cbfe1c47bfbb4f74da88   358191:
 548ee1fb71cb7254b51c6499e166554af32c1a41   358175:
 f7a7c6ae5ce3d4883cf539b440bc5c619d78ec70   358143:
 8a426b6a1e547860c06c0bdb047af4adfdd2fda0 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5db44c17ecc2..42829df89732 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d7aaa0cfe3d1b5ee23958fce71973e3ae9e52e4
+refs/heads/master: 24a1f16de97c4cf0029d9acd04be06db32208726
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 0dfecaf599ff..fc9b98794b25 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3637,6 +3637,7 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
 	struct intel_encoder *encoder;
 	int pipe = intel_crtc->pipe;
 	int plane = intel_crtc->plane;
+	u32 pctl;
 
 
 	if (!intel_crtc->active)
@@ -3656,6 +3657,13 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
 
 	intel_disable_plane(dev_priv, plane, pipe);
 	intel_disable_pipe(dev_priv, pipe);
+
+	/* Disable pannel fitter if it is on this pipe. */
+	pctl = I915_READ(PFIT_CONTROL);
+	if ((pctl & PFIT_ENABLE) &&
+	    ((pctl & PFIT_PIPE_MASK) >> PFIT_PIPE_SHIFT) == pipe)
+		I915_WRITE(PFIT_CONTROL, 0);
+
 	intel_disable_pll(dev_priv, pipe);
 
 	intel_crtc->active = false;