Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:06:16 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_dma.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.9
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.1.1.1.2.8 Wed Jul 24 03:06:00 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Wed Jul 24 03:06:16 2013
@@ -954,7 +954,12 @@ static int i915_getparam(struct drm_devi
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;
