summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux-core/drmP.h14
-rw-r--r--linux-core/i810_drv.c1
-rw-r--r--linux-core/i830_drv.c1
-rw-r--r--linux-core/sis_drv.c1
-rw-r--r--linux/drmP.h14
-rw-r--r--linux/gamma_drv.c2
-rw-r--r--linux/gamma_drv.h13
-rw-r--r--linux/gamma_lists.h (renamed from linux/drm_lists.h)7
-rw-r--r--linux/i810_drv.c1
-rw-r--r--linux/i830_drv.c1
-rw-r--r--linux/sis_drv.c1
11 files changed, 14 insertions, 42 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 9fd4149a..2cdc5f09 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -833,20 +833,6 @@ extern void DRM(dma_immediate_bh)( void *dev );
#endif
#endif
- /* Buffer list support (drm_lists.h) */
-#if __HAVE_DMA_WAITLIST
-extern int DRM(waitlist_create)(drm_waitlist_t *bl, int count);
-extern int DRM(waitlist_destroy)(drm_waitlist_t *bl);
-extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
-extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
-#endif
-#if __HAVE_DMA_FREELIST
-extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
-extern int DRM(freelist_destroy)(drm_freelist_t *bl);
-extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
- drm_buf_t *buf);
-extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
-#endif
#endif /* __HAVE_DMA */
#if __REALLY_HAVE_AGP
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index 439d7887..0bc79386 100644
--- a/linux-core/i810_drv.c
+++ b/linux-core/i810_drv.c
@@ -49,7 +49,6 @@
#include "drm_init.h"
#include "drm_ioctl.h"
#include "drm_lock.h"
-#include "drm_lists.h"
#include "drm_memory.h"
#include "drm_proc.h"
#include "drm_vm.h"
diff --git a/linux-core/i830_drv.c b/linux-core/i830_drv.c
index d9a659a4..0735c94d 100644
--- a/linux-core/i830_drv.c
+++ b/linux-core/i830_drv.c
@@ -51,7 +51,6 @@
#include "drm_init.h"
#include "drm_ioctl.h"
#include "drm_lock.h"
-#include "drm_lists.h"
#include "drm_memory.h"
#include "drm_proc.h"
#include "drm_vm.h"
diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c
index 0c917bd4..3dd075d3 100644
--- a/linux-core/sis_drv.c
+++ b/linux-core/sis_drv.c
@@ -41,7 +41,6 @@
#include "drm_fops.h"
#include "drm_init.h"
#include "drm_ioctl.h"
-#include "drm_lists.h"
#include "drm_lock.h"
#include "drm_memory.h"
#include "drm_proc.h"
diff --git a/linux/drmP.h b/linux/drmP.h
index 9fd4149a..2cdc5f09 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -833,20 +833,6 @@ extern void DRM(dma_immediate_bh)( void *dev );
#endif
#endif
- /* Buffer list support (drm_lists.h) */
-#if __HAVE_DMA_WAITLIST
-extern int DRM(waitlist_create)(drm_waitlist_t *bl, int count);
-extern int DRM(waitlist_destroy)(drm_waitlist_t *bl);
-extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
-extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
-#endif
-#if __HAVE_DMA_FREELIST
-extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
-extern int DRM(freelist_destroy)(drm_freelist_t *bl);
-extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
- drm_buf_t *buf);
-extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
-#endif
#endif /* __HAVE_DMA */
#if __REALLY_HAVE_AGP
diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c
index 32b12e0a..f1b8b205 100644
--- a/linux/gamma_drv.c
+++ b/linux/gamma_drv.c
@@ -48,7 +48,7 @@
#include "drm_fops.h"
#include "drm_init.h"
#include "drm_ioctl.h"
-#include "drm_lists.h"
+#include "gamma_lists.h" /* NOTE */
#include "drm_lock.h"
#include "gamma_lock.h" /* NOTE */
#include "drm_memory.h"
diff --git a/linux/gamma_drv.h b/linux/gamma_drv.h
index 2509ffbb..36affa68 100644
--- a/linux/gamma_drv.h
+++ b/linux/gamma_drv.h
@@ -68,6 +68,19 @@ extern int DRM(dma_enqueue)(struct file *filp, drm_dma_t *dma);
extern int DRM(dma_get_buffers)(struct file *filp, drm_dma_t *dma);
+/* Gamma-specific code pulled from drm_lists.h (now renamed gamma_lists.h):
+ */
+extern int DRM(waitlist_create)(drm_waitlist_t *bl, int count);
+extern int DRM(waitlist_destroy)(drm_waitlist_t *bl);
+extern int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
+extern drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl);
+extern int DRM(freelist_create)(drm_freelist_t *bl, int count);
+extern int DRM(freelist_destroy)(drm_freelist_t *bl);
+extern int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
+ drm_buf_t *buf);
+extern drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block);
+
+
#define GLINT_DRI_BUF_COUNT 256
diff --git a/linux/drm_lists.h b/linux/gamma_lists.h
index 09b6289b..cfb07782 100644
--- a/linux/drm_lists.h
+++ b/linux/gamma_lists.h
@@ -32,7 +32,6 @@
#define __NO_VERSION__
#include "drmP.h"
-#if __HAVE_DMA_WAITLIST
int DRM(waitlist_create)(drm_waitlist_t *bl, int count)
{
@@ -104,11 +103,6 @@ drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl)
return buf;
}
-#endif /* __HAVE_DMA_WAITLIST */
-
-
-#if __HAVE_DMA_FREELIST
-
int DRM(freelist_create)(drm_freelist_t *bl, int count)
{
atomic_set(&bl->count, 0);
@@ -220,4 +214,3 @@ drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block)
return DRM(freelist_try)(bl);
}
-#endif /* __HAVE_DMA_FREELIST */
diff --git a/linux/i810_drv.c b/linux/i810_drv.c
index 439d7887..0bc79386 100644
--- a/linux/i810_drv.c
+++ b/linux/i810_drv.c
@@ -49,7 +49,6 @@
#include "drm_init.h"
#include "drm_ioctl.h"
#include "drm_lock.h"
-#include "drm_lists.h"
#include "drm_memory.h"
#include "drm_proc.h"
#include "drm_vm.h"
diff --git a/linux/i830_drv.c b/linux/i830_drv.c
index d9a659a4..0735c94d 100644
--- a/linux/i830_drv.c
+++ b/linux/i830_drv.c
@@ -51,7 +51,6 @@
#include "drm_init.h"
#include "drm_ioctl.h"
#include "drm_lock.h"
-#include "drm_lists.h"
#include "drm_memory.h"
#include "drm_proc.h"
#include "drm_vm.h"
diff --git a/linux/sis_drv.c b/linux/sis_drv.c
index 0c917bd4..3dd075d3 100644
--- a/linux/sis_drv.c
+++ b/linux/sis_drv.c
@@ -41,7 +41,6 @@
#include "drm_fops.h"
#include "drm_init.h"
#include "drm_ioctl.h"
-#include "drm_lists.h"
#include "drm_lock.h"
#include "drm_memory.h"
#include "drm_proc.h"