diff options
| author | Jesse Barnes | 2013-03-28 17:55:38 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-04-02 20:31:06 +0200 |
| commit | 19332d7aab1e38eb01fb387266f493d335d9931c (patch) | |
| tree | 72b37c875590acd83c2e31acad64c0563cdcf146 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: sprite support for ValleyView v4 (diff) | |
| download | kernel-qcow2-linux-19332d7aab1e38eb01fb387266f493d335d9931c.tar.gz kernel-qcow2-linux-19332d7aab1e38eb01fb387266f493d335d9931c.tar.xz kernel-qcow2-linux-19332d7aab1e38eb01fb387266f493d335d9931c.zip | |
drm/i915: add sprite assertion function for VLV
Need to make sure sprites are disabled before shutting off a pipe.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2ee38660a5a5..59d52b729a68 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1288,6 +1288,25 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv, } } +static void assert_sprites_disabled(struct drm_i915_private *dev_priv, + enum pipe pipe) +{ + int reg, i; + u32 val; + + if (!IS_VALLEYVIEW(dev_priv->dev)) + return; + + /* Need to check both planes against the pipe */ + for (i = 0; i < dev_priv->num_plane; i++) { + reg = SPCNTR(pipe, i); + val = I915_READ(reg); + WARN((val & SP_ENABLE), + "sprite %d assertion failure, should be off on pipe %c but is still active\n", + pipe * 2 + i, pipe_name(pipe)); + } +} + static void assert_pch_refclk_enabled(struct drm_i915_private *dev_priv) { u32 val; @@ -1872,6 +1891,7 @@ static void intel_disable_pipe(struct drm_i915_private *dev_priv, * or we might hang the display. */ assert_planes_disabled(dev_priv, pipe); + assert_sprites_disabled(dev_priv, pipe); /* Don't disable pipe A or pipe A PLLs if needed */ if (pipe == PIPE_A && (dev_priv->quirks & QUIRK_PIPEA_FORCE)) |