diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-08-10 10:52:18 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-08-10 10:52:18 +0000 |
| commit | e19873654926c7717fbd0929a8164658a33e4519 (patch) | |
| tree | 115e917e0f4171adb5b822e8bc625afce762b3b9 /linux-core | |
| parent | b08879b636b627fff554d46450b635a36faa1a6a (diff) | |
remove HAVE_DMA_WAITLIST
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drmP.h | 4 | ||||
| -rw-r--r-- | linux-core/drm_drv.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index db6ea59f..95a79c8e 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -105,9 +105,6 @@ #ifndef __HAVE_IRQ #define __HAVE_IRQ 0 #endif -#ifndef __HAVE_DMA_WAITLIST -#define __HAVE_DMA_WAITLIST 0 -#endif #ifndef __HAVE_DMA_FREELIST #define __HAVE_DMA_FREELIST 0 #endif @@ -593,6 +590,7 @@ struct drm_driver_fn { int (*kernel_context_switch)(struct drm_device *dev, int old, int new); int (*kernel_context_switch_unlock)(struct drm_device *dev); int (*dma_schedule)(struct drm_device *dev, int locked); + int (*waitlist_destroy)(drm_waitlist_t *bl); }; /** * DRM device structure. diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 836405e6..1d5bb86e 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -464,9 +464,9 @@ static int DRM(takedown)( drm_device_t *dev ) #if __HAVE_DMA_QUEUE || __HAVE_MULTIPLE_DMA_QUEUES if ( dev->queuelist ) { for ( i = 0 ; i < dev->queue_count ; i++ ) { -#if __HAVE_DMA_WAITLIST - DRM(waitlist_destroy)( &dev->queuelist[i]->waitlist ); -#endif + if (dev->fn_tbl.waitlist_destroy) + dev->fn_tbl.waitlist_destroy( &dev->queuelist[i]->waitlist); + if ( dev->queuelist[i] ) { DRM(free)( dev->queuelist[i], sizeof(*dev->queuelist[0]), |