[Intel-gfx] [PATCH 39/89] drm/i915/skl: Adjust assert_sprites_disabled()

[Rodrigo Vivi]

Reviewed-by: Rodrigo VIvi <rodrigo.vivi at intel.com>

On Thu, Sep 4, 2014 at 4:27 AM, Damien Lespiau <damien.lespiau at intel.com>
wrote:

> Let's put to good use the new PLANE_CTL macros.
>
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 48d2d0d..3d9f447 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1335,7 +1335,14 @@ static void assert_sprites_disabled(struct
> drm_i915_private *dev_priv,
>         int reg, sprite;
>         u32 val;
>
> -       if (IS_VALLEYVIEW(dev)) {
> +       if (INTEL_INFO(dev)->gen >= 9) {
> +               for_each_sprite(pipe, sprite) {
> +                       val = I915_READ(PLANE_CTL(pipe, sprite));
> +                       WARN(val & PLANE_CTL_ENABLE,
> +                            "plane %d assertion failure, should be off on
> pipe %c but is still active\n",
> +                            sprite, pipe_name(pipe));
> +               }
> +       } else if (IS_VALLEYVIEW(dev)) {
>                 for_each_sprite(pipe, sprite) {
>                         reg = SPCNTR(pipe, sprite);
>                         val = I915_READ(reg);
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20140917/41bc43c0/attachment.html>