diff options
author | Marco Peereboom <marco@cvs.openbsd.org> | 2010-04-15 19:17:49 +0000 |
---|---|---|
committer | Marco Peereboom <marco@cvs.openbsd.org> | 2010-04-15 19:17:49 +0000 |
commit | e37c76aaeedb956240049010b753ee35ddb94033 (patch) | |
tree | efea438bfe7d77b88b6492851f83ef01f532ddd4 /sys/dev/pci | |
parent | eaa6b28fb9728a691e804f3bfc3c2bc30d937ca7 (diff) |
Use IPL_TTY instead of IPB_BIO as suggested by oga.
Tested by me and mlarkin on amd64 and i386
ok oga
Diffstat (limited to 'sys/dev/pci')
-rw-r--r-- | sys/dev/pci/drm/drm_irq.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/i915_drv.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/drm/mach64_irq.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/mga_drv.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/mga_irq.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/r128_irq.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon_drv.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/drm/radeon_irq.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pci/drm/drm_irq.c b/sys/dev/pci/drm/drm_irq.c index 8f0e3cd7ea9..443c35be12b 100644 --- a/sys/dev/pci/drm/drm_irq.c +++ b/sys/dev/pci/drm/drm_irq.c @@ -196,7 +196,7 @@ drm_vblank_init(struct drm_device *dev, int num_crtcs) return (ENOMEM); dev->vblank->vb_num = num_crtcs; - mtx_init(&dev->vblank->vb_lock, IPL_BIO); + mtx_init(&dev->vblank->vb_lock, IPL_TTY); timeout_set(&dev->vblank->vb_disable_timer, vblank_disable, dev); return (0); diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c index 8ebab115ff6..95c038ef0d1 100644 --- a/sys/dev/pci/drm/i915_drv.c +++ b/sys/dev/pci/drm/i915_drv.c @@ -357,7 +357,7 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux) * set up interrupt handler, note that we don't switch the interrupt * on until the X server talks to us, kms will change this. */ - dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO, + dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_TTY, inteldrm_intr, dev_priv, dev_priv->dev.dv_xname); if (dev_priv->irqh == NULL) { printf(": couldn't establish interrupt\n"); @@ -368,7 +368,7 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux) dev_priv->irq_mask_reg = ~I915_INTERRUPT_ENABLE_FIX; #ifdef INTELDRM_GEM - dev_priv->workq = workq_create("intelrel", 1, IPL_BIO); + dev_priv->workq = workq_create("intelrel", 1, IPL_TTY); if (dev_priv->workq == NULL) { printf("couldn't create workq\n"); return; @@ -449,7 +449,7 @@ 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); + mtx_init(&dev_priv->user_irq_lock, IPL_TTY); /* All intel chipsets need to be treated as agp, so just pass one */ dev_priv->drmdev = drm_attach_pci(&inteldrm_driver, pa, 1, self); diff --git a/sys/dev/pci/drm/mach64_irq.c b/sys/dev/pci/drm/mach64_irq.c index a2b9aa20b5f..046ba590a09 100644 --- a/sys/dev/pci/drm/mach64_irq.c +++ b/sys/dev/pci/drm/mach64_irq.c @@ -151,7 +151,7 @@ mach64_driver_irq_install(struct drm_device * dev) mach64_disable_vblank_local(dev, 0); - dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO, + dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_TTY, machdrm_intr, dev, dev_priv->dev.dv_xname); if (dev_priv->irqh == NULL) return (ENOENT); diff --git a/sys/dev/pci/drm/mga_drv.c b/sys/dev/pci/drm/mga_drv.c index 8915f10b7d4..b6e22b3155f 100644 --- a/sys/dev/pci/drm/mga_drv.c +++ b/sys/dev/pci/drm/mga_drv.c @@ -125,7 +125,7 @@ mgadrm_attach(struct device *parent, struct device *self, void *aux) return; } printf(": %s\n", pci_intr_string(pa->pa_pc, dev_priv->ih)); - mtx_init(&dev_priv->fence_lock, IPL_BIO); + mtx_init(&dev_priv->fence_lock, IPL_TTY); /* XXX pcie */ is_agp = pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP, diff --git a/sys/dev/pci/drm/mga_irq.c b/sys/dev/pci/drm/mga_irq.c index 97efae586e7..0ed2b3fc4e1 100644 --- a/sys/dev/pci/drm/mga_irq.c +++ b/sys/dev/pci/drm/mga_irq.c @@ -155,7 +155,7 @@ mga_driver_irq_install(struct drm_device * dev) /* Clear bits if they're already high */ MGA_WRITE(MGA_ICLEAR, ~0); - dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO, + dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_TTY, mgadrm_intr, dev, dev_priv->dev.dv_xname); if (dev_priv->irqh == NULL) return (ENOENT); diff --git a/sys/dev/pci/drm/r128_irq.c b/sys/dev/pci/drm/r128_irq.c index 855b8206993..bc1c7a7fa72 100644 --- a/sys/dev/pci/drm/r128_irq.c +++ b/sys/dev/pci/drm/r128_irq.c @@ -107,7 +107,7 @@ r128_driver_irq_install(struct drm_device * dev) /* Clear vblank bit if it's already high */ R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK); - dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO, + dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_TTY, ragedrm_intr, dev, dev_priv->dev.dv_xname); if (dev_priv->irqh == NULL) return (ENOENT); diff --git a/sys/dev/pci/drm/radeon_drv.c b/sys/dev/pci/drm/radeon_drv.c index ec1653633e9..3ada7ec8f6a 100644 --- a/sys/dev/pci/drm/radeon_drv.c +++ b/sys/dev/pci/drm/radeon_drv.c @@ -591,7 +591,7 @@ radeondrm_attach(struct device *parent, struct device *self, void *aux) return; } printf(": %s\n", pci_intr_string(pa->pa_pc, dev_priv->ih)); - mtx_init(&dev_priv->swi_lock, IPL_BIO); + mtx_init(&dev_priv->swi_lock, IPL_TTY); switch (dev_priv->flags & RADEON_FAMILY_MASK) { case CHIP_R100: diff --git a/sys/dev/pci/drm/radeon_irq.c b/sys/dev/pci/drm/radeon_irq.c index 87ad05a4116..80ca577e4b9 100644 --- a/sys/dev/pci/drm/radeon_irq.c +++ b/sys/dev/pci/drm/radeon_irq.c @@ -342,7 +342,7 @@ radeon_driver_irq_install(struct drm_device * dev) /* Clear bits if they're already high */ radeon_acknowledge_irqs(dev_priv, &dummy); - dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO, + dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_TTY, radeondrm_intr, dev, dev_priv->dev.dv_xname); if (dev_priv->irqh == NULL) return (ENOENT); |