drm/i915: Cleanup gen3 irq uninstall
Bring the for-each-pipe loops together so that the code is easier on the eyes. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
00d98ebd94
commit
55b39755ea
1 changed files with 4 additions and 7 deletions
|
@ -2527,9 +2527,6 @@ static void i915_irq_uninstall(struct drm_device * dev)
|
||||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||||
int pipe;
|
int pipe;
|
||||||
|
|
||||||
if (!dev_priv)
|
|
||||||
return;
|
|
||||||
|
|
||||||
dev_priv->vblank_pipe = 0;
|
dev_priv->vblank_pipe = 0;
|
||||||
|
|
||||||
if (I915_HAS_HOTPLUG(dev)) {
|
if (I915_HAS_HOTPLUG(dev)) {
|
||||||
|
@ -2538,14 +2535,14 @@ static void i915_irq_uninstall(struct drm_device * dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
I915_WRITE16(HWSTAM, 0xffff);
|
I915_WRITE16(HWSTAM, 0xffff);
|
||||||
for_each_pipe(pipe)
|
for_each_pipe(pipe) {
|
||||||
|
/* Clear enable bits; then clear status bits */
|
||||||
I915_WRITE(PIPESTAT(pipe), 0);
|
I915_WRITE(PIPESTAT(pipe), 0);
|
||||||
|
I915_WRITE(PIPESTAT(pipe), I915_READ(PIPESTAT(pipe)));
|
||||||
|
}
|
||||||
I915_WRITE(IMR, 0xffffffff);
|
I915_WRITE(IMR, 0xffffffff);
|
||||||
I915_WRITE(IER, 0x0);
|
I915_WRITE(IER, 0x0);
|
||||||
|
|
||||||
for_each_pipe(pipe)
|
|
||||||
I915_WRITE(PIPESTAT(pipe),
|
|
||||||
I915_READ(PIPESTAT(pipe)) & 0x8000ffff);
|
|
||||||
I915_WRITE(IIR, I915_READ(IIR));
|
I915_WRITE(IIR, I915_READ(IIR));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue