Don't bother to keep a count of irqs recieved, the os does that for us.

2 files changed, 4 insertions, 6 deletions

diff --git a/sys/dev/pci/drm/i915_drv.h b/sys/dev/pci/drm/i915_drv.h
index 659d575253f..2a7dfd13d04 100644
--- a/sys/dev/pci/drm/i915_drv.h
+++ b/sys/dev/pci/drm/i915_drv.h
@@ -95,14 +95,13 @@ typedef struct drm_i915_private {
 	unsigned int		 status_gfx_addr;
 	u_int32_t		 counter;
 
-	atomic_t irq_received;
 	/* Protects user_irq_refcount and irq_mask reg */
-	struct mutex user_irq_lock;
+	struct			 mutex user_irq_lock;
 	/* Refcount for user irq, only enabled when needed */
-	int user_irq_refcount;
+	int			 user_irq_refcount;
 	/* Cached value of IMR to avoid reads in updating the bitfield */
-	u_int32_t irq_mask_reg;
-	u_int32_t pipestat[2];
+	u_int32_t		 irq_mask_reg;
+	u_int32_t		 pipestat[2];
 
 	int tex_lru_log_granularity;
 	int allow_batchbuffer;
diff --git a/sys/dev/pci/drm/i915_irq.c b/sys/dev/pci/drm/i915_irq.c
index 9ac3585cc71..a6223061779 100644
--- a/sys/dev/pci/drm/i915_irq.c
+++ b/sys/dev/pci/drm/i915_irq.c
@@ -206,7 +206,6 @@ inteldrm_intr(void *arg)
 	 * lock is to protect from writes to PIPESTAT and IMR from other cores.
 	 */
 	mtx_enter(&dev_priv->user_irq_lock);
-	atomic_inc(&dev_priv->irq_received);
 	iir = I915_READ(IIR);
 	if (iir == 0) {
 		mtx_leave(&dev_priv->user_irq_lock);