Make the various drm drivers print the interrupt they're using.

ok oga@

9 files changed, 12 insertions, 2 deletions

diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 86120e38f80..3584d93dc49 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -76,13 +76,12 @@ drm_attach_pci(const struct drm_driver_info *driver, struct pci_attach_args *pa,
 	arg.busid_len = 20;
 	arg.busid = malloc(arg.busid_len + 1, M_DRM, M_NOWAIT);
 	if (arg.busid == NULL) {
-		printf(": no memory for drm\n");
+		printf("%s: no memory for drm\n", dev->dv_xname);
 		return (NULL);
 	}
 	snprintf(arg.busid, arg.busid_len, "pci:%04x:%02x:%02x.%1x",
 	    pa->pa_domain, pa->pa_bus, pa->pa_device, pa->pa_function);
 
-	printf("\n");
 	return (config_found(dev, &arg, drmprint));
 }
 
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c
index 6eb0bb2a1f4..6a966387da4 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915_drv.c
@@ -161,6 +161,8 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux)
 		}
 	}
 
+	printf(": %s\n", pci_intr_string(pa->pa_pc, dev_priv->ih));
+
 	mtx_init(&dev_priv->user_irq_lock, IPL_BIO);
 
 	/* All intel chipsets need to be treated as agp, so just pass one */
diff --git a/sys/dev/pci/drm/mach64_drv.c b/sys/dev/pci/drm/mach64_drv.c
index f1d6271ef08..b2c3f67da44 100644
--- a/sys/dev/pci/drm/mach64_drv.c
+++ b/sys/dev/pci/drm/mach64_drv.c
@@ -123,6 +123,7 @@ machdrm_attach(struct device *parent, struct device *self, void *aux)
 		printf(": couldn't map interrupt\n");
 		return;
 	}
+	printf(": %s\n", pci_intr_string(pa->pa_pc, dev_priv->ih));
 
 	is_agp = pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
 	    NULL, NULL);
diff --git a/sys/dev/pci/drm/mga_drv.c b/sys/dev/pci/drm/mga_drv.c
index 91cc7691219..ae790759e68 100644
--- a/sys/dev/pci/drm/mga_drv.c
+++ b/sys/dev/pci/drm/mga_drv.c
@@ -167,6 +167,8 @@ mgadrm_attach(struct device *parent, struct device *self, void *aux)
 		printf(": can't map mmio space\n");
 		return;
 	}
+	/* XXX map interrupt */
+	printf("\n");
 
 	/* XXX pcie */
 	is_agp = pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
diff --git a/sys/dev/pci/drm/r128_drv.c b/sys/dev/pci/drm/r128_drv.c
index 2e482066256..480256daf26 100644
--- a/sys/dev/pci/drm/r128_drv.c
+++ b/sys/dev/pci/drm/r128_drv.c
@@ -140,6 +140,7 @@ ragedrm_attach(struct device *parent, struct device *self, void *aux)
 		printf(": couldn't map interrupt\n");
 		return;
 	}
+	printf(": %s\n", pci_intr_string(pa->pa_pc, dev_priv->ih));
 
 	is_agp = pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
 	    NULL, NULL);
diff --git a/sys/dev/pci/drm/radeon_drv.c b/sys/dev/pci/drm/radeon_drv.c
index 2a334c46643..d287e850d0a 100644
--- a/sys/dev/pci/drm/radeon_drv.c
+++ b/sys/dev/pci/drm/radeon_drv.c
@@ -549,6 +549,7 @@ radeondrm_attach(struct device *parent, struct device *self, void *aux)
 		printf(": couldn't map interrupt\n");
 		return;
 	}
+	printf(": %s\n", pci_intr_string(pa->pa_pc, dev_priv->ih));
 
 	switch (dev_priv->flags & RADEON_FAMILY_MASK) {
 	case CHIP_R100:
diff --git a/sys/dev/pci/drm/savage_drv.c b/sys/dev/pci/drm/savage_drv.c
index cac31667265..68f17119ffe 100644
--- a/sys/dev/pci/drm/savage_drv.c
+++ b/sys/dev/pci/drm/savage_drv.c
@@ -173,6 +173,7 @@ savagedrm_attach(struct device *parent, struct device *self, void *aux)
 
 	is_agp = pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
 	    NULL, NULL);
+	printf("\n");
 
 	dev_priv->drmdev = drm_attach_pci(&savagedrm_driver, pa, is_agp, self);
 }
diff --git a/sys/dev/pci/drm/sis_drv.c b/sys/dev/pci/drm/sis_drv.c
index cdda6c78718..257a2a83ee2 100644
--- a/sys/dev/pci/drm/sis_drv.c
+++ b/sys/dev/pci/drm/sis_drv.c
@@ -77,6 +77,7 @@ sisdrm_attach(struct device *parent, struct device *self, void *aux)
 
 	is_agp = pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
 	    NULL, NULL);
+	printf("\n");
 
 	dev_priv->drmdev = drm_attach_pci(&sis_driver, pa, is_agp, self);
 }
diff --git a/sys/dev/pci/drm/tdfx_drv.c b/sys/dev/pci/drm/tdfx_drv.c
index 647a70f3b38..8277cc3d450 100644
--- a/sys/dev/pci/drm/tdfx_drv.c
+++ b/sys/dev/pci/drm/tdfx_drv.c
@@ -78,6 +78,8 @@ tdfxdrm_attach(struct device *parent, struct device *self, void *aux)
 	struct tdfxdrm_softc	*dev_priv = (struct tdfxdrm_softc *)self;
 	struct pci_attach_args	*pa = aux;
 
+	printf("\n");
+
 	/* never agp */
 	dev_priv->drmdev = drm_attach_pci(&tdfxdrm_driver, pa, 0, self);
 }