Commit d38043a0 authored by Dave Airlie's avatar Dave Airlie

Dump __HAVE_DMA_FREELIST is only used by gamma.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 6584b1ab
...@@ -98,9 +98,6 @@ ...@@ -98,9 +98,6 @@
#ifndef __HAVE_DMA_WAITLIST #ifndef __HAVE_DMA_WAITLIST
#define __HAVE_DMA_WAITLIST 0 #define __HAVE_DMA_WAITLIST 0
#endif #endif
#ifndef __HAVE_DMA_FREELIST
#define __HAVE_DMA_FREELIST 0
#endif
#define __REALLY_HAVE_AGP (__HAVE_AGP && (defined(CONFIG_AGP) || \ #define __REALLY_HAVE_AGP (__HAVE_AGP && (defined(CONFIG_AGP) || \
defined(CONFIG_AGP_MODULE))) defined(CONFIG_AGP_MODULE)))
......
...@@ -336,10 +336,6 @@ static void DRM(cleanup_buf_error)(drm_buf_entry_t *entry) ...@@ -336,10 +336,6 @@ static void DRM(cleanup_buf_error)(drm_buf_entry_t *entry)
sizeof(*entry->buflist), sizeof(*entry->buflist),
DRM_MEM_BUFS); DRM_MEM_BUFS);
#if __HAVE_DMA_FREELIST
DRM(freelist_destroy)(&entry->freelist);
#endif
entry->buf_count = 0; entry->buf_count = 0;
} }
} }
...@@ -508,12 +504,6 @@ int DRM(addbufs_agp)( struct inode *inode, struct file *filp, ...@@ -508,12 +504,6 @@ int DRM(addbufs_agp)( struct inode *inode, struct file *filp,
DRM_DEBUG( "dma->buf_count : %d\n", dma->buf_count ); DRM_DEBUG( "dma->buf_count : %d\n", dma->buf_count );
DRM_DEBUG( "entry->buf_count : %d\n", entry->buf_count ); DRM_DEBUG( "entry->buf_count : %d\n", entry->buf_count );
#if __HAVE_DMA_FREELIST
DRM(freelist_create)( &entry->freelist, entry->buf_count );
for ( i = 0 ; i < entry->buf_count ; i++ ) {
DRM(freelist_put)( dev, &entry->freelist, &entry->buflist[i] );
}
#endif
up( &dev->struct_sem ); up( &dev->struct_sem );
request.count = entry->buf_count; request.count = entry->buf_count;
...@@ -747,12 +737,6 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp, ...@@ -747,12 +737,6 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp,
dma->page_count += entry->seg_count << page_order; dma->page_count += entry->seg_count << page_order;
dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order); dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order);
#if __HAVE_DMA_FREELIST
DRM(freelist_create)( &entry->freelist, entry->buf_count );
for ( i = 0 ; i < entry->buf_count ; i++ ) {
DRM(freelist_put)( dev, &entry->freelist, &entry->buflist[i] );
}
#endif
up( &dev->struct_sem ); up( &dev->struct_sem );
request.count = entry->buf_count; request.count = entry->buf_count;
...@@ -918,12 +902,6 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp, ...@@ -918,12 +902,6 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp,
DRM_DEBUG( "dma->buf_count : %d\n", dma->buf_count ); DRM_DEBUG( "dma->buf_count : %d\n", dma->buf_count );
DRM_DEBUG( "entry->buf_count : %d\n", entry->buf_count ); DRM_DEBUG( "entry->buf_count : %d\n", entry->buf_count );
#if __HAVE_DMA_FREELIST
DRM(freelist_create)( &entry->freelist, entry->buf_count );
for ( i = 0 ; i < entry->buf_count ; i++ ) {
DRM(freelist_put)( dev, &entry->freelist, &entry->buflist[i] );
}
#endif
up( &dev->struct_sem ); up( &dev->struct_sem );
request.count = entry->buf_count; request.count = entry->buf_count;
......
...@@ -116,9 +116,6 @@ void DRM(dma_takedown)(drm_device_t *dev) ...@@ -116,9 +116,6 @@ void DRM(dma_takedown)(drm_device_t *dev)
dma->bufs[i].buf_count * dma->bufs[i].buf_count *
sizeof(*dma->bufs[0].buflist), sizeof(*dma->bufs[0].buflist),
DRM_MEM_BUFS); DRM_MEM_BUFS);
#if __HAVE_DMA_FREELIST
DRM(freelist_destroy)(&dma->bufs[i].freelist);
#endif
} }
} }
...@@ -158,16 +155,6 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf) ...@@ -158,16 +155,6 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) { if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) {
wake_up_interruptible(&buf->dma_wait); wake_up_interruptible(&buf->dma_wait);
} }
#if __HAVE_DMA_FREELIST
else {
drm_device_dma_t *dma = dev->dma;
/* If processes are waiting, the last one
to wake will put the buffer on the free
list. If no processes are waiting, we
put the buffer on the freelist here. */
DRM(freelist_put)(dev, &dma->bufs[buf->order].freelist, buf);
}
#endif
} }
#if !__HAVE_DMA_RECLAIM #if !__HAVE_DMA_RECLAIM
......
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
#define __HAVE_DMA_WAITQUEUE 1 #define __HAVE_DMA_WAITQUEUE 1
#define __HAVE_DMA_WAITLIST 1 #define __HAVE_DMA_WAITLIST 1
#define __HAVE_DMA_FREELIST 1 /* removed from DRM HAVE_DMA_FREELIST */
//#define __HAVE_DMA_FREELIST 1
#define __HAVE_DMA_SCHEDULE 1 #define __HAVE_DMA_SCHEDULE 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment