diff options
| author | Ville Syrjälä | 2013-10-01 17:02:20 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-10-10 12:47:03 +0200 |
| commit | 0037f71c4b7fc0cc70714c5a076f54f348c04dea (patch) | |
| tree | 01d71f00f8fd40cfbab2682bc19d70505efcd6b1 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Rename intel_{enable, disable}_plane to intel_{enable, disable}_pri... (diff) | |
| download | kernel-qcow2-linux-0037f71c4b7fc0cc70714c5a076f54f348c04dea.tar.gz kernel-qcow2-linux-0037f71c4b7fc0cc70714c5a076f54f348c04dea.tar.xz kernel-qcow2-linux-0037f71c4b7fc0cc70714c5a076f54f348c04dea.zip | |
drm/i915: WARN if primary plane state doesn't match expectations
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a2acf79c365d..2e3289c37034 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1840,6 +1840,8 @@ static void intel_enable_primary_plane(struct drm_i915_private *dev_priv, /* If the pipe isn't enabled, we can't pump pixels and may hang */ assert_pipe_enabled(dev_priv, pipe); + WARN(!intel_crtc->primary_disabled, "Primary plane already enabled\n"); + intel_crtc->primary_disabled = false; reg = DSPCNTR(plane); @@ -1868,6 +1870,8 @@ static void intel_disable_primary_plane(struct drm_i915_private *dev_priv, int reg; u32 val; + WARN(intel_crtc->primary_disabled, "Primary plane already disabled\n"); + intel_crtc->primary_disabled = true; reg = DSPCNTR(plane); |