summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/mga_drv.h
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-11-23 21:35:02 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-11-23 21:35:02 +0000
commitebcc0685bc5a51f710b5063c90f783646d4dbb53 (patch)
tree4bcfaa5f472f81112a5ee846adf18228e990ea42 /sys/dev/pci/drm/mga_drv.h
parent17ac785bb3a684774ebdad9381363f2883fec44a (diff)
Map device interrupts in the attach routine. and remove more need for
dev->pa by doing the pci_intr_establish/disestablish dance in the driver function, not in drm. This removes the need for interrupt_{pre,post}install callbacks, instead just provide a interrupt_install() callback.
Diffstat (limited to 'sys/dev/pci/drm/mga_drv.h')
-rw-r--r--sys/dev/pci/drm/mga_drv.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/mga_drv.h b/sys/dev/pci/drm/mga_drv.h
index 77d62d9c5dc..a46858aa549 100644
--- a/sys/dev/pci/drm/mga_drv.h
+++ b/sys/dev/pci/drm/mga_drv.h
@@ -78,6 +78,10 @@ typedef struct drm_mga_private {
struct device dev;
struct device *drmdev;
+ pci_chipset_tag_t pc;
+ pci_intr_handle_t ih;
+ void *irqh;
+
struct vga_pci_bar *regs;
drm_mga_primary_buffer_t prim;
@@ -185,8 +189,7 @@ extern u32 mga_get_vblank_counter(struct drm_device *dev, int crtc);
extern int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence);
extern int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
-extern void mga_driver_irq_preinstall(struct drm_device * dev);
-extern int mga_driver_irq_postinstall(struct drm_device * dev);
+extern int mga_driver_irq_install(struct drm_device * dev);
extern void mga_driver_irq_uninstall(struct drm_device * dev);
extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg);