[ 53/86] drm/i915: disable shared panel fitter for pipe

From: Greg Kroah-Hartman
Date: Tue Feb 26 2013 - 19:18:37 EST

3.4-stable review patch. If anyone has any objections, please let me know.


From: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>

commit 24a1f16de97c4cf0029d9acd04be06db32208726 upstream.

If encoder is switched off by BIOS, but the panel fitter is left on,
we never try to turn off the panel fitter and leave it still attached
to the pipe - which can cause blurry output elsewhere.

Based on work by Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58867
Signed-off-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx>
Tested-by: Andreas Sturmlechner <andreas.sturmlechner@xxxxxxxxx>
[danvet: Remove the redundant HAS_PCH_SPLIT check and add a tiny
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

drivers/gpu/drm/i915/intel_display.c | 8 ++++++++
1 file changed, 8 insertions(+)

--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3303,6 +3303,7 @@ static void i9xx_crtc_disable(struct drm
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int pipe = intel_crtc->pipe;
int plane = intel_crtc->plane;
+ u32 pctl;

if (!intel_crtc->active)
@@ -3318,6 +3319,13 @@ static void i9xx_crtc_disable(struct drm

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)
intel_disable_pll(dev_priv, pipe);

intel_crtc->active = false;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/