From 2950f9e6823d43abae151966ae808d1a63e6659c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 17 Oct 2003 05:13:48 +0000 Subject: - 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. --- shared-core/mga_dma.c | 2 +- shared-core/mga_irq.c | 2 +- shared-core/r128_cce.c | 2 +- shared-core/r128_irq.c | 2 +- shared-core/radeon_cp.c | 2 +- shared-core/radeon_irq.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'shared-core') diff --git a/shared-core/mga_dma.c b/shared-core/mga_dma.c index bfaee0d8..f2d92f15 100644 --- a/shared-core/mga_dma.c +++ b/shared-core/mga_dma.c @@ -639,7 +639,7 @@ int mga_do_cleanup_dma( drm_device_t *dev ) { DRM_DEBUG( "\n" ); -#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. diff --git a/shared-core/mga_irq.c b/shared-core/mga_irq.c index ccced64f..e486618b 100644 --- a/shared-core/mga_irq.c +++ b/shared-core/mga_irq.c @@ -36,7 +36,7 @@ #include "mga_drm.h" #include "mga_drv.h" -irqreturn_t mga_dma_service( DRM_IRQ_ARGS ) +irqreturn_t mga_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_mga_private_t *dev_priv = diff --git a/shared-core/r128_cce.c b/shared-core/r128_cce.c index 13b44a5c..fdf220bd 100644 --- a/shared-core/r128_cce.c +++ b/shared-core/r128_cce.c @@ -594,7 +594,7 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init ) int r128_do_cleanup_cce( drm_device_t *dev ) { -#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. diff --git a/shared-core/r128_irq.c b/shared-core/r128_irq.c index c060e187..e77a5538 100644 --- a/shared-core/r128_irq.c +++ b/shared-core/r128_irq.c @@ -36,7 +36,7 @@ #include "r128_drm.h" #include "r128_drv.h" -irqreturn_t r128_dma_service( DRM_IRQ_ARGS ) +irqreturn_t r128_irq_handler( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_r128_private_t *dev_priv = diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 3e3618e3..b24880a8 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1271,7 +1271,7 @@ int radeon_do_cleanup_cp( drm_device_t *dev ) { DRM_DEBUG( "\n" ); -#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. diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c index 1d339f28..f503153a 100644 --- a/shared-core/radeon_irq.c +++ b/shared-core/radeon_irq.c @@ -54,7 +54,7 @@ * tied to dma at all, this is just a hangover from dri prehistory. */ -irqreturn_t DRM(dma_service)( DRM_IRQ_ARGS ) +irqreturn_t DRM(irq_handler)( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_radeon_private_t *dev_priv = -- cgit v1.2.3