| From 09b415087bed853d41d688aa6e946468140314aa Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Thu, 11 Apr 2013 16:29:10 +0200 |
| Subject: drm/i915: add i9xx pfit pipe asserts |
| |
| We can only enable the pfit if the pipe is disabled. Ensure that this |
| is obeyed with a neat assert. |
| |
| Also check whether the pfit is off before enabling it - if not we've |
| lost track of things somewhere since the pfit is only ever used by the |
| lvds output. |
| |
| v2: Fix spell fail in the commit message pointed out by Ville&Jani. |
| |
| Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit e29a18faaa18470f313b570fdf2d0f75c35e6cb2) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_lvds.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c |
| index b52f5cc7610b..2379b5e404df 100644 |
| --- a/drivers/gpu/drm/i915/intel_lvds.c |
| +++ b/drivers/gpu/drm/i915/intel_lvds.c |
| @@ -159,6 +159,9 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder) |
| if (HAS_PCH_SPLIT(dev) || !enc->pfit_control) |
| return; |
| |
| + WARN_ON(I915_READ(PFIT_CONTROL) & PFIT_ENABLE); |
| + assert_pipe_disabled(dev_priv, to_intel_crtc(encoder->base.crtc)->pipe); |
| + |
| /* |
| * Enable automatic panel scaling so that non-native modes |
| * fill the screen. The panel fitter should only be |
| -- |
| 1.8.5.rc3 |
| |
