[PATCH 12/22] drm/i915: rip out dri1 breadcrumb updates from gen5+ irq handlers

Daniel Vetter
2012-04-23T15:55:52Z

We never supported dri1 on gen5+.

VLV never had that code, so no need to remove it.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_irq.c | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4814ba9..080a979 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -618,7 +618,6 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int ret = IRQ_NONE;
u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
- struct drm_i915_master_private *master_priv;

atomic_inc(&dev_priv->irq_received);

@@ -637,13 +636,6 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)

ret = IRQ_HANDLED;

- if (dev->primary->master) {
- master_priv = dev->primary->master->driver_priv;
- if (master_priv->sarea_priv)
- master_priv->sarea_priv->last_dispatch =
- READ_BREADCRUMB(dev_priv);
- }
-
snb_gt_irq_handler(dev, dev_priv, gt_iir);

if (de_iir & DE_GSE_IVB)
@@ -705,7 +697,6 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
int ret = IRQ_NONE;
u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
u32 hotplug_mask;
- struct drm_i915_master_private *master_priv;

atomic_inc(&dev_priv->irq_received);

@@ -730,13 +721,6 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)

ret = IRQ_HANDLED;

- if (dev->primary->master) {
- master_priv = dev->primary->master->driver_priv;
- if (master_priv->sarea_priv)
- master_priv->sarea_priv->last_dispatch =
- READ_BREADCRUMB(dev_priv);
- }
-
if (IS_GEN5(dev))
ilk_gt_irq_handler(dev, dev_priv, gt_iir);
else
--
1.7.7.6