summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-06-21 00:12:21 -0700
committerKeith Packard <keithp@keithp.com>2008-06-21 00:12:21 -0700
commit33114e4a1167ac79cb53043e77c16cc7fe40a640 (patch)
tree6b52185b449a3f5388deb3c3a82fbf42b225205a /shared-core
parentf4bd566e0bead0904c38bb3a526eb9b35b215ff5 (diff)
[intel] Count received interrupts
Another patch adds this to a /proc/dri file for debugging and monitoring.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_drv.h1
-rw-r--r--shared-core/i915_irq.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 87776504..9f500330 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -119,7 +119,6 @@ typedef struct drm_i915_private {
wait_queue_head_t irq_queue;
atomic_t irq_received;
- atomic_t irq_emitted;
int tex_lru_log_granularity;
int allow_batchbuffer;
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 767181c2..c0abcbdd 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -456,6 +456,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
#if 0
DRM_DEBUG("flag=%08x\n", iir);
#endif
+ atomic_inc(&dev_priv->irq_received);
if (iir == 0) {
DRM_DEBUG ("iir 0x%08x im 0x%08x ie 0x%08x pipea 0x%08x pipeb 0x%08x\n",
iir,
@@ -963,6 +964,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ atomic_set(&dev_priv->irq_received, 0);
I915_WRITE(I915REG_HWSTAM, 0xffff);
I915_WRITE(I915REG_INT_ENABLE_R, 0x0);
I915_WRITE(I915REG_INT_MASK_R, 0xffffffff);