Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04feced9 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Provide a bit more info when pipestat bits are wrong 



Print the enable_mask and status_mask from
__i915_{enable,disable}_pipestat() when the caller has messed them up
somehow.

v2: Use pipe_name() (Damien)
    Fix a typo in the commit message

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9991ae78

drivers/gpu/drm/i915/i915_irq.c

+8 −4
Original line number Diff line number Diff line
@@ -531,8 +531,10 @@ __i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, 


	assert_spin_locked(&dev_priv->irq_lock);



	if (WARN_ON_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||

	                 status_mask & ~PIPESTAT_INT_STATUS_MASK))

	if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||

		      status_mask & ~PIPESTAT_INT_STATUS_MASK,

		      "pipe %c: enable_mask=0x%x, status_mask=0x%x\n",

		      pipe_name(pipe), enable_mask, status_mask))

		return;



	if ((pipestat & enable_mask) == enable_mask)
@@ -555,8 +557,10 @@ __i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, 


	assert_spin_locked(&dev_priv->irq_lock);



	if (WARN_ON_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||

	                 status_mask & ~PIPESTAT_INT_STATUS_MASK))

	if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||

		      status_mask & ~PIPESTAT_INT_STATUS_MASK,

		      "pipe %c: enable_mask=0x%x, status_mask=0x%x\n",

		      pipe_name(pipe), enable_mask, status_mask))

		return;



	if ((pipestat & enable_mask) == 0)