Commit 0037f71c authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm/i915: WARN if primary plane state doesn't match expectations

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d1de00ef
...@@ -1840,6 +1840,8 @@ static void intel_enable_primary_plane(struct drm_i915_private *dev_priv, ...@@ -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 */ /* If the pipe isn't enabled, we can't pump pixels and may hang */
assert_pipe_enabled(dev_priv, pipe); assert_pipe_enabled(dev_priv, pipe);
WARN(!intel_crtc->primary_disabled, "Primary plane already enabled\n");
intel_crtc->primary_disabled = false; intel_crtc->primary_disabled = false;
reg = DSPCNTR(plane); reg = DSPCNTR(plane);
...@@ -1868,6 +1870,8 @@ static void intel_disable_primary_plane(struct drm_i915_private *dev_priv, ...@@ -1868,6 +1870,8 @@ static void intel_disable_primary_plane(struct drm_i915_private *dev_priv,
int reg; int reg;
u32 val; u32 val;
WARN(intel_crtc->primary_disabled, "Primary plane already disabled\n");
intel_crtc->primary_disabled = true; intel_crtc->primary_disabled = true;
reg = DSPCNTR(plane); reg = DSPCNTR(plane);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment