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

Commit c9a9a268 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: unify gen6/gen8 rps irq handler 



After the previous patch the GEN8 RPS handler became very similar to the
GEN6 version, so unify the two functions.

No functional change.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Move one misplaced hunk from a later patch to fix a bisect
issue as reported by Wu Fengguang's 0-day builder and fix suggested by
Imre.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a72fbc3a

drivers/gpu/drm/i915/i915_irq.c

+6 −14
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ static const u32 hpd_status_i915[] = { /* i915 and valleyview are the same */ 
	POSTING_READ(type##IMR); \

} while (0)



static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir);



/* For display hotplug interrupt */

void

ironlake_enable_display_irq(struct drm_i915_private *dev_priv, u32 mask)
@@ -1286,19 +1288,6 @@ static void snb_gt_irq_handler(struct drm_device *dev, 
		ivybridge_parity_error_irq_handler(dev, gt_iir);

}



static void gen8_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)

{

	if ((pm_iir & dev_priv->pm_rps_events) == 0)

		return;



	spin_lock(&dev_priv->irq_lock);

	dev_priv->rps.pm_iir |= pm_iir & dev_priv->pm_rps_events;

	gen6_disable_pm_irq(dev_priv, pm_iir & dev_priv->pm_rps_events);

	spin_unlock(&dev_priv->irq_lock);



	queue_work(dev_priv->wq, &dev_priv->rps.work);

}



static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev,

				       struct drm_i915_private *dev_priv,

				       u32 master_ctl)
@@ -1360,7 +1349,7 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev, 
			I915_WRITE(GEN8_GT_IIR(2),

				   tmp & dev_priv->pm_rps_events);

			ret = IRQ_HANDLED;

			gen8_rps_irq_handler(dev_priv, tmp);

			gen6_rps_irq_handler(dev_priv, tmp);

		} else

			DRM_ERROR("The master control interrupt lied (PM)!\n");

	}
@@ -1669,6 +1658,9 @@ static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir) 
		queue_work(dev_priv->wq, &dev_priv->rps.work);

	}



	if (INTEL_INFO(dev_priv)->gen >= 8)

		return;



	if (HAS_VEBOX(dev_priv->dev)) {

		if (pm_iir & PM_VEBOX_USER_INTERRUPT)

			notify_ring(dev_priv->dev, &dev_priv->ring[VECS]);