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

Commit 41c54e51 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Kill dev_priv->irq_received 



Not sure anyone cares about this information. I suppose most people
would just look at /proc/interrupts instead.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 501e01d7

drivers/gpu/drm/i915/i915_debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -712,8 +712,6 @@ static int i915_interrupt_info(struct seq_file *m, void *data) 
		seq_printf(m, "Graphics Interrupt mask:		%08x\n",

			   I915_READ(GTIMR));

	}

	seq_printf(m, "Interrupts received: %d\n",

		   atomic_read(&dev_priv->irq_received));

	for_each_ring(ring, dev_priv, i) {

		if (INTEL_INFO(dev)->gen >= 6) {

			seq_printf(m,

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -1360,8 +1360,6 @@ typedef struct drm_i915_private { 
	drm_dma_handle_t *status_page_dmah;

	struct resource mch_res;



	atomic_t irq_received;



	/* protects the irq masks */

	spinlock_t irq_lock;

drivers/gpu/drm/i915/i915_irq.c

+0 −26
Original line number Diff line number Diff line
@@ -1434,8 +1434,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) 
	int pipe;

	u32 pipe_stats[I915_MAX_PIPES];



	atomic_inc(&dev_priv->irq_received);



	while (true) {

		iir = I915_READ(VLV_IIR);

		gt_iir = I915_READ(GTIIR);
@@ -1744,8 +1742,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) 
	u32 de_iir, gt_iir, de_ier, sde_ier = 0;

	irqreturn_t ret = IRQ_NONE;



	atomic_inc(&dev_priv->irq_received);



	/* We get interrupts on unclaimed registers, so check for this before we

	 * do any I915_{READ,WRITE}. */

	intel_uncore_check_errors(dev);
@@ -1814,8 +1810,6 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg) 
	uint32_t tmp = 0;

	enum pipe pipe;



	atomic_inc(&dev_priv->irq_received);



	master_ctl = I915_READ(GEN8_MASTER_IRQ);

	master_ctl &= ~GEN8_MASTER_IRQ_CONTROL;

	if (!master_ctl)
@@ -2638,8 +2632,6 @@ static void ironlake_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(HWSTAM, 0xeffe);



	I915_WRITE(DEIMR, 0xffffffff);
@@ -2656,8 +2648,6 @@ static void valleyview_irq_preinstall(struct drm_device *dev) 
	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int pipe;



	atomic_set(&dev_priv->irq_received, 0);



	/* VLV magic */

	I915_WRITE(VLV_IMR, 0);

	I915_WRITE(RING_IMR(RENDER_RING_BASE), 0);
@@ -2687,8 +2677,6 @@ static void gen8_irq_preinstall(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe;



	atomic_set(&dev_priv->irq_received, 0);



	I915_WRITE(GEN8_MASTER_IRQ, 0);

	POSTING_READ(GEN8_MASTER_IRQ);
@@ -3013,8 +3001,6 @@ static void gen8_irq_uninstall(struct drm_device *dev) 
	if (!dev_priv)

		return;



	atomic_set(&dev_priv->irq_received, 0);



	I915_WRITE(GEN8_MASTER_IRQ, 0);



#define GEN8_IRQ_FINI_NDX(type, which) do { \
@@ -3107,8 +3093,6 @@ static void i8xx_irq_preinstall(struct drm_device * dev) 
	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int pipe;



	atomic_set(&dev_priv->irq_received, 0);



	for_each_pipe(pipe)

		I915_WRITE(PIPESTAT(pipe), 0);

	I915_WRITE16(IMR, 0xffff);
@@ -3193,8 +3177,6 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) 
		I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |

		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;



	atomic_inc(&dev_priv->irq_received);



	iir = I915_READ16(IIR);

	if (iir == 0)

		return IRQ_NONE;
@@ -3272,8 +3254,6 @@ static void i915_irq_preinstall(struct drm_device * dev) 
	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int pipe;



	atomic_set(&dev_priv->irq_received, 0);



	if (I915_HAS_HOTPLUG(dev)) {

		I915_WRITE(PORT_HOTPLUG_EN, 0);

		I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
@@ -3379,8 +3359,6 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) 
		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;

	int pipe, ret = IRQ_NONE;



	atomic_inc(&dev_priv->irq_received);



	iir = I915_READ(IIR);

	do {

		bool irq_received = (iir & ~flip_mask) != 0;
@@ -3503,8 +3481,6 @@ static void i965_irq_preinstall(struct drm_device * dev) 
	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	int pipe;



	atomic_set(&dev_priv->irq_received, 0);



	I915_WRITE(PORT_HOTPLUG_EN, 0);

	I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
@@ -3618,8 +3594,6 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) 
		I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |

		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;



	atomic_inc(&dev_priv->irq_received);



	iir = I915_READ(IIR);



	for (;;) {