diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-08-24 11:15:53 +0000 |
| commit | d4dbf457813e97531ded3bf24f3b6ad421189c69 (patch) | |
| tree | 8e47c1dd5d7cf9c8c4bce4a7e34531fc9a8eae75 /shared-core/mach64_dma.c | |
| parent | eac498baeaf9b57b448065b0fb9f4eeadbb9aa6b (diff) | |
Merged drmfntbl-0-0-2
Diffstat (limited to 'shared-core/mach64_dma.c')
| -rw-r--r-- | shared-core/mach64_dma.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shared-core/mach64_dma.c b/shared-core/mach64_dma.c index 4f90916d..210a6103 100644 --- a/shared-core/mach64_dma.c +++ b/shared-core/mach64_dma.c @@ -972,13 +972,11 @@ int mach64_do_cleanup_dma( drm_device_t *dev ) { DRM_DEBUG( "%s\n", __FUNCTION__ ); -#if _HAVE_DMA_IRQ /* Make sure interrupts are disabled here because the uninstall ioctl * may not have been called from userspace and after dev_private * is freed, it's too late. */ if ( dev->irq ) DRM(irq_uninstall)(dev); -#endif if ( dev->dev_private ) { drm_mach64_private_t *dev_priv = dev->dev_private; @@ -1335,5 +1333,11 @@ static void mach64_driver_pretakedown(drm_device_t *dev) void mach64_driver_register_fns(drm_device_t *dev) { + dev->driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL; dev->fn_tbl.pretakedown = mach64_driver_pretakedown; + dev->fn_tbl.vblank_wait = mach64_driver_vblank_wait; + dev->fn_tbl.irq_preinstall = mach64_driver_irq_preinstall; + dev->fn_tbl.irq_postinstall = mach64_driver_irq_postinstall; + dev->fn_tbl.irq_uninstall = mach64_driver_irq_uninstall; + dev->fn_tbl.irq_handler = mach64_driver_irq_handler; } |