diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-11 16:29:10 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-18 09:55:47 +0200 |
| commit | e29a18faaa18470f313b570fdf2d0f75c35e6cb2 (patch) | |
| tree | 4c97cd979d536adc149e2ed4d92313e0fb990b41 /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | 58c6eaa24dbd8c97ef5f643324f087271aa79d64 (diff) | |
| download | blackbird-op-linux-e29a18faaa18470f313b570fdf2d0f75c35e6cb2.tar.gz blackbird-op-linux-e29a18faaa18470f313b570fdf2d0f75c35e6cb2.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index f36f1baabd5a..563f5052fcfc 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 |
