[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Use dev->irq_en...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40b25bbf2c62
branches:  riastradh-drm2
changeset: 788292:40b25bbf2c62
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:06:16 2013 +0000

description:
Use dev->irq_enabled, not dev->pdev->irq, in i915_getparam.

The drm irq establishment code maintains dev->irq_enabled, and this
way we need not maintain it separately in the pci layer.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (16 lines):

diff -r c98dafa646c3 -r 40b25bbf2c62 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Wed Jul 24 03:06:00 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c    Wed Jul 24 03:06:16 2013 +0000
@@ -954,7 +954,12 @@
 
        switch (param->param) {
        case I915_PARAM_IRQ_ACTIVE:
+#ifdef __NetBSD__
+               /* XXX This is the old code; why was it changed upstream?  */
+               value = dev->irq_enabled ? 1 : 0;
+#else
                value = dev->pdev->irq ? 1 : 0;
+#endif
                break;
        case I915_PARAM_ALLOW_BATCHBUFFER:
                value = dev_priv->dri1.allow_batchbuffer ? 1 : 0;