remove HAVE_DMA_WAITLIST

8 files changed, 9 insertions, 15 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]),
diff --git a/linux/drmP.h b/linux/drmP.h
index db6ea59f..95a79c8e 100644
--- a/linux/drmP.h
+++ b/linux/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/drm_drv.h b/linux/drm_drv.h
index 836405e6..1d5bb86e 100644
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -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]),
diff --git a/linux/gamma.h b/linux/gamma.h
index 6a4c4253..b7c4e8a0 100644
--- a/linux/gamma.h
+++ b/linux/gamma.h
@@ -74,7 +74,6 @@
 #define __HAVE_MULTIPLE_DMA_QUEUES	1
 #define __HAVE_DMA_WAITQUEUE		1
 
-#define __HAVE_DMA_WAITLIST		1
 #define __HAVE_DMA_FREELIST		1
 
 #define __HAVE_IRQ			1
diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c
index b7f214fa..c7150421 100644
--- a/linux/gamma_dma.c
+++ b/linux/gamma_dma.c
@@ -951,4 +951,5 @@ void gamma_driver_register_fns(drm_device_t *dev)
 	dev->fn_tbl.dma_flush_block_and_flush = gamma_flush_block_and_flush;
 	dev->fn_tbl.dma_flush_unblock = gamma_flush_unblock;
 	dev->fn_tbl.dma_schedule = gamma_dma_schedule;
+	dev->fn_tbl.waitlist_destroy = gamma_waitlist_destroy;
 }
diff --git a/linux/i810.h b/linux/i810.h
index 33403ed6..aea8a63c 100644
--- a/linux/i810.h
+++ b/linux/i810.h
@@ -88,7 +88,6 @@
  */
 #define __HAVE_DMA		1
 #define __HAVE_DMA_QUEUE	1
-#define __HAVE_DMA_WAITLIST	0
 #define __HAVE_DMA_RECLAIM	1
 
 /* Don't need an irq any more.  The template code will make sure that
diff --git a/linux/i830.h b/linux/i830.h
index 694baa1e..7e176f2c 100644
--- a/linux/i830.h
+++ b/linux/i830.h
@@ -87,7 +87,6 @@
  */
 #define __HAVE_DMA		1
 #define __HAVE_DMA_QUEUE	1
-#define __HAVE_DMA_WAITLIST	0
 #define __HAVE_DMA_RECLAIM	1
 
 /* Driver will work either way: IRQ's save cpu time when waiting for