drm/i915: unify gen6/gen8 rps irq handler
Subsystems (2)
PATCH 2/8 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 Imre Deak <[email protected]>
--- drivers/gpu/drm/i915/i915_irq.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +4 -14
@@ -1289,19 +1289,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)
@@ -1363,7 +1350,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" ); }
@@ -1672,6 +1659,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 ]);
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx