diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-10-17 05:13:48 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-10-17 05:13:48 +0000 |
| commit | 2950f9e6823d43abae151966ae808d1a63e6659c (patch) | |
| tree | b7fbcbc101da31d02c5f3748568bc9caf54b13fa /linux/gamma_dma.c | |
| parent | ff58476011ba8fe72d65e884380d3d86710bfdd4 (diff) | |
- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle them
from __HAVE_DMA. This will be useful for adding vblank sync support to
sis and tdfx. Rename dma_service to irq_handler, which is more
accurately what it is.
- Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have
the right number of underscores. This may have been a problem in the
case that the server died without doing its DRM_IOCTL_CONTROL to
uninit.
Diffstat (limited to 'linux/gamma_dma.c')
| -rw-r--r-- | linux/gamma_dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c index 3fc6c9f8..bae19bbe 100644 --- a/linux/gamma_dma.c +++ b/linux/gamma_dma.c @@ -105,7 +105,7 @@ static inline int gamma_dma_is_ready(drm_device_t *dev) return(!GAMMA_READ(GAMMA_DMACOUNT)); } -irqreturn_t gamma_dma_service( DRM_IRQ_ARGS ) +irqreturn_t gamma_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *)arg; drm_device_dma_t *dma = dev->dma; @@ -253,7 +253,7 @@ static void gamma_dma_timer_bh(unsigned long dev) gamma_dma_schedule((drm_device_t *)dev, 0); } -void gamma_dma_immediate_bh(void *dev) +void gamma_irq_immediate_bh(void *dev) { gamma_dma_schedule(dev, 0); } @@ -647,7 +647,7 @@ int gamma_do_cleanup_dma( drm_device_t *dev ) { DRM_DEBUG( "%s\n", __FUNCTION__ ); -#if _HAVE_DMA_IRQ +#if __HAVE_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. |