diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-05 10:08:31 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-05 18:18:14 -0500 |
commit | 88f23b8fa3e6357c423af24ec31c661fc12f884b (patch) | |
tree | 252545a58f2c64a7d299af992bd7203591350442 /drivers/gpu/drm/i915/i915_irq.c | |
parent | 160b1543cdae83e9f8914ac7afc3d2bd686140af (diff) |
drm/i915: Avoid using PIPE_CONTROL on Ironlake
The workaround is hideous and we are using the STORE_DWORD on all other
generations on all other rings, so use for the gen5 render ring as
well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 5e831b7eb3f1..02e4dd82f754 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -349,7 +349,7 @@ static irqreturn_t ironlake_irq_handler(struct drm_device *dev) | |||
349 | READ_BREADCRUMB(dev_priv); | 349 | READ_BREADCRUMB(dev_priv); |
350 | } | 350 | } |
351 | 351 | ||
352 | if (gt_iir & (GT_USER_INTERRUPT | GT_PIPE_NOTIFY)) | 352 | if (gt_iir & GT_USER_INTERRUPT) |
353 | notify_ring(dev, &dev_priv->ring[RCS]); | 353 | notify_ring(dev, &dev_priv->ring[RCS]); |
354 | if (gt_iir & bsd_usr_interrupt) | 354 | if (gt_iir & bsd_usr_interrupt) |
355 | notify_ring(dev, &dev_priv->ring[VCS]); | 355 | notify_ring(dev, &dev_priv->ring[VCS]); |
@@ -1556,7 +1556,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev) | |||
1556 | GT_BLT_USER_INTERRUPT; | 1556 | GT_BLT_USER_INTERRUPT; |
1557 | else | 1557 | else |
1558 | render_irqs = | 1558 | render_irqs = |
1559 | GT_PIPE_NOTIFY | | 1559 | GT_USER_INTERRUPT | |
1560 | GT_BSD_USER_INTERRUPT; | 1560 | GT_BSD_USER_INTERRUPT; |
1561 | I915_WRITE(GTIER, render_irqs); | 1561 | I915_WRITE(GTIER, render_irqs); |
1562 | POSTING_READ(GTIER); | 1562 | POSTING_READ(GTIER); |