diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-04-03 06:28:33 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-03 11:23:47 -0400 |
| commit | 04feced98a434c7046108671dc5b6f50f3b63ed7 (patch) | |
| tree | b85d2aed8919f8016a2b3e1c7b7f1a13839aef14 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 9991ae787a0c87fe7c783b4b6f4754c3cdbb6213 (diff) | |
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: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 327d584e4353..bdda3b556165 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
| @@ -531,8 +531,10 @@ __i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, | |||
| 531 | 531 | ||
| 532 | assert_spin_locked(&dev_priv->irq_lock); | 532 | assert_spin_locked(&dev_priv->irq_lock); |
| 533 | 533 | ||
| 534 | if (WARN_ON_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK || | 534 | if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK || |
| 535 | status_mask & ~PIPESTAT_INT_STATUS_MASK)) | 535 | status_mask & ~PIPESTAT_INT_STATUS_MASK, |
| 536 | "pipe %c: enable_mask=0x%x, status_mask=0x%x\n", | ||
| 537 | pipe_name(pipe), enable_mask, status_mask)) | ||
| 536 | return; | 538 | return; |
| 537 | 539 | ||
| 538 | if ((pipestat & enable_mask) == enable_mask) | 540 | if ((pipestat & enable_mask) == enable_mask) |
| @@ -555,8 +557,10 @@ __i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, | |||
| 555 | 557 | ||
| 556 | assert_spin_locked(&dev_priv->irq_lock); | 558 | assert_spin_locked(&dev_priv->irq_lock); |
| 557 | 559 | ||
| 558 | if (WARN_ON_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK || | 560 | if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK || |
| 559 | status_mask & ~PIPESTAT_INT_STATUS_MASK)) | 561 | status_mask & ~PIPESTAT_INT_STATUS_MASK, |
| 562 | "pipe %c: enable_mask=0x%x, status_mask=0x%x\n", | ||
| 563 | pipe_name(pipe), enable_mask, status_mask)) | ||
| 560 | return; | 564 | return; |
| 561 | 565 | ||
| 562 | if ((pipestat & enable_mask) == 0) | 566 | if ((pipestat & enable_mask) == 0) |