<div dir="ltr">Reviewed-by: Rodrigo VIvi <<a href="mailto:rodrigo.vivi@intel.com">rodrigo.vivi@intel.com</a>></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 4, 2014 at 4:27 AM, Damien Lespiau <span dir="ltr"><<a href="mailto:damien.lespiau@intel.com" target="_blank">damien.lespiau@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Let's put to good use the new PLANE_CTL macros.<br>
<br>
Signed-off-by: Damien Lespiau <<a href="mailto:damien.lespiau@intel.com">damien.lespiau@intel.com</a>><br>
---<br>
 drivers/gpu/drm/i915/intel_display.c | 9 ++++++++-<br>
 1 file changed, 8 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c<br>
index 48d2d0d..3d9f447 100644<br>
--- a/drivers/gpu/drm/i915/intel_display.c<br>
+++ b/drivers/gpu/drm/i915/intel_display.c<br>
@@ -1335,7 +1335,14 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,<br>
        int reg, sprite;<br>
        u32 val;<br>
<br>
-       if (IS_VALLEYVIEW(dev)) {<br>
+       if (INTEL_INFO(dev)->gen >= 9) {<br>
+               for_each_sprite(pipe, sprite) {<br>
+                       val = I915_READ(PLANE_CTL(pipe, sprite));<br>
+                       WARN(val & PLANE_CTL_ENABLE,<br>
+                            "plane %d assertion failure, should be off on pipe %c but is still active\n",<br>
+                            sprite, pipe_name(pipe));<br>
+               }<br>
+       } else if (IS_VALLEYVIEW(dev)) {<br>
                for_each_sprite(pipe, sprite) {<br>
                        reg = SPCNTR(pipe, sprite);<br>
                        val = I915_READ(reg);<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.3.1<br>
<br>
_______________________________________________<br>
Intel-gfx mailing list<br>
<a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Rodrigo Vivi</div><div>Blog: <a href="http://blog.vivi.eng.br" target="_blank">http://blog.vivi.eng.br</a></div><div> </div>
</div>