diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-16 13:09:31 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-16 15:09:11 -0700 |
| commit | c847271179da382af52a6874e2edec586b88af75 (patch) | |
| tree | 304dc5ffc9d1ee91fff5bbead167b9536ace0e8b /shared-core/i915_dma.c | |
| parent | 3e48e144992fb11b31875989d45bc8a7c041cdef (diff) | |
[linux] Use the device's irq for handler setup instead of stale dev->irq.
This fixes registration when MSI is set up after the stub function fills in
dev->irq. Otherwise /proc/interrupts would report attachment to the fasteoi
interrupt. dev->irq is still exposed (and updated at IRQ setup)
for the drivers that use it for whatever reason.
Diffstat (limited to 'shared-core/i915_dma.c')
| -rw-r--r-- | shared-core/i915_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 2157c594..2db6be07 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -150,7 +150,7 @@ static int i915_dma_cleanup(struct drm_device * dev) * may not have been called from userspace and after dev_private * is freed, it's too late. */ - if (dev->irq) + if (dev->irq_enabled) drm_irq_uninstall(dev); if (dev_priv->ring.virtual_start) { @@ -889,7 +889,7 @@ static int i915_getparam(struct drm_device *dev, void *data, switch (param->param) { case I915_PARAM_IRQ_ACTIVE: - value = dev->irq ? 1 : 0; + value = dev->irq_enabled ? 1 : 0; break; case I915_PARAM_ALLOW_BATCHBUFFER: value = dev_priv->allow_batchbuffer ? 1 : 0; |